X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-base.yaml;h=ceacb0b2922e479ab8c32a9e57bdea1b511f8ee8;hb=35ccc61dbeaa246278a9466a3b40736f157f827b;hp=8db00d8f4bae4dc1a8b6f3ed25c07956217c6fd4;hpb=77480ec29c1a8b520bd895fb3fe0c6a0f4da120b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 8db00d8f..ceacb0b2 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Nova base service. Shared for all Nova services.
@@ -18,6 +18,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
   NovaPassword:
     description: The password for the nova service and db account, used by nova-api.
     type: string
@@ -66,6 +70,60 @@ parameters:
     type: string
     description: Nova Compute upgrade level
     default: ''
+  NovaCronArchiveDeleteRowsMinute:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Minute
+    default: '1'
+  NovaCronArchiveDeleteRowsHour:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Hour
+    default: '0'
+  NovaCronArchiveDeleteRowsMonthday:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Month Day
+    default: '*'
+  NovaCronArchiveDeleteRowsMonth:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Month
+    default: '*'
+  NovaCronArchiveDeleteRowsWeekday:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Week Day
+    default: '*'
+  NovaCronArchiveDeleteRowsMaxRows:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Max Rows
+    default: '100'
+  NovaCronArchiveDeleteRowsUser:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - User
+    default: 'nova'
+  NovaCronArchiveDeleteRowsDestination:
+    type: string
+    description: >
+        Cron to move deleted instances to another table - Log destination
+    default: '/var/log/nova/nova-rowsflush.log'
+  NovaCronArchiveDeleteRowsUntilComplete:
+    type: boolean
+    description: >
+        Cron to move deleted instances to another table - Until complete
+    default: false
+  NovaPlacementAPIInterface:
+    type: string
+    description: >
+        Endpoint interface to be used for the placement API.
+    default: 'internal'
+
+conditions:
+
+  compute_upgrade_level_empty: {equals : [{get_param: UpgradeLevelNovaCompute}, '']}
 
 outputs:
   role_data:
@@ -73,45 +131,87 @@ outputs:
     value:
       service_name: nova_base
       config_settings:
-        nova::rabbit_password: {get_param: RabbitPassword}
-        nova::rabbit_userid: {get_param: RabbitUserName}
-        nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
-        nova::rabbit_port: {get_param: RabbitClientPort}
-        nova::database_connection:
-          list_join:
-            - ''
-            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-              - '://nova:'
-              - {get_param: NovaPassword}
-              - '@'
-              - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/nova'
-        nova::api_database_connection:
-          list_join:
-            - ''
-            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
-              - '://nova_api:'
-              - {get_param: NovaPassword}
-              - '@'
-              - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/nova_api'
-        nova::debug: {get_param: Debug}
-        nova::purge_config: {get_param: EnableConfigPurge}
-        nova::network::neutron::neutron_project_name: 'service'
-        nova::network::neutron::neutron_username: 'neutron'
-        nova::network::neutron::dhcp_domain: ''
-        nova::network::neutron::neutron_password: {get_param: NeutronPassword}
-        nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
-        nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
-        nova::rabbit_heartbeat_timeout_threshold: 60
-        nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
-        nova::host: '"%{::fqdn}"'    # NOTE: extra quoting is needed.
-        nova::notify_on_state_change: 'vm_and_task_state'
-        nova::notification_driver: messagingv2
-        nova::network::neutron::neutron_auth_type: 'v3password'
-        nova::db::database_db_max_retries: -1
-        nova::db::database_max_retries: -1
-        nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
-        nova::use_ipv6: {get_param: NovaIPv6}
-        nova::upgrade_level_compute: {get_param: UpgradeLevelNovaCompute}
-        nova::network::neutron::neutron_ovs_bridge: {get_param: NovaOVSBridge}
+        map_merge:
+        - nova::rabbit_password: {get_param: RabbitPassword}
+          nova::rabbit_userid: {get_param: RabbitUserName}
+          nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
+          nova::rabbit_port: {get_param: RabbitClientPort}
+          nova::placement::project_name: 'service'
+          nova::placement::password: {get_param: NovaPassword}
+          nova::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+          nova::placement::os_region_name: {get_param: KeystoneRegion}
+          nova::placement::os_interface: {get_param: NovaPlacementAPIInterface}
+          nova::database_connection:
+            list_join:
+              - ''
+              - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+                - '://nova:'
+                - {get_param: NovaPassword}
+                - '@'
+                - {get_param: [EndpointMap, MysqlInternal, host]}
+                - '/nova'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+          nova::api_database_connection:
+            list_join:
+              - ''
+              - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+                - '://nova_api:'
+                - {get_param: NovaPassword}
+                - '@'
+                - {get_param: [EndpointMap, MysqlInternal, host]}
+                - '/nova_api'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+          nova::placement_database_connection:
+            list_join:
+              - ''
+              - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+                - '://nova_placement:'
+                - {get_param: NovaPassword}
+                - '@'
+                - {get_param: [EndpointMap, MysqlInternal, host]}
+                - '/nova_placement'
+                - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
+          nova::debug: {get_param: Debug}
+          nova::purge_config: {get_param: EnableConfigPurge}
+          nova::network::neutron::neutron_project_name: 'service'
+          nova::network::neutron::neutron_username: 'neutron'
+          nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion}
+          nova::network::neutron::dhcp_domain: ''
+          nova::network::neutron::neutron_password: {get_param: NeutronPassword}
+          nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
+          nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
+          nova::rabbit_heartbeat_timeout_threshold: 60
+          nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'
+          nova::host: '%{::fqdn}'
+          nova::notify_on_state_change: 'vm_and_task_state'
+          nova::notification_driver: messagingv2
+          nova::network::neutron::neutron_auth_type: 'v3password'
+          nova::db::database_db_max_retries: -1
+          nova::db::database_max_retries: -1
+          nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
+          nova::use_ipv6: {get_param: NovaIPv6}
+          nova::network::neutron::neutron_ovs_bridge: {get_param: NovaOVSBridge}
+          nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
+          nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}
+          nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday}
+          nova::cron::archive_deleted_rows::month: {get_param: NovaCronArchiveDeleteRowsMonth}
+          nova::cron::archive_deleted_rows::weekday: {get_param: NovaCronArchiveDeleteRowsWeekday}
+          nova::cron::archive_deleted_rows::max_rows: {get_param: NovaCronArchiveDeleteRowsMaxRows}
+          nova::cron::archive_deleted_rows::user: {get_param: NovaCronArchiveDeleteRowsUser}
+          nova::cron::archive_deleted_rows::destination: {get_param: NovaCronArchiveDeleteRowsDestination}
+          nova::cron::archive_deleted_rows::until_complete: {get_param: NovaCronArchiveDeleteRowsUntilComplete}
+        -
+          if:
+          - compute_upgrade_level_empty
+          - {}
+          - nova::upgrade_level_compute: {get_param: UpgradeLevelNovaCompute}
+      service_config_settings:
+        mysql:
+          # NOTE(aschultz): this should be configurable if/when we support more
+          # complex cell v2 configurations. For now, this is the default cell
+          # created for the cell v2 configuration
+          nova::db::mysql_api::setup_cell0: true
+          nova::rabbit_password: {get_param: RabbitPassword}
+          nova::rabbit_userid: {get_param: RabbitUserName}
+          nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
+          nova::rabbit_port: {get_param: RabbitClientPort}