Merge "Remove deleted Nova rows"

puppet/controller.yaml

@@ -502,6 +502,11 @@ parameters:
     default: 0
     description: Number of workers for Neutron service.
     type: number
+  NovaEnableDBPurge:
+    default: true
+    description: |
+        Whether to create cron job for purging soft deleted rows in Nova database.
+    type: boolean
   NovaPassword:
     description: The password for the nova service and db account, used by nova-api.
     type: string
@@ -1046,6 +1051,7 @@ resources:
               - '/ceilometer'
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
+        nova_enable_db_purge: {get_param: NovaEnableDBPurge}
         nova_password: {get_param: NovaPassword}
         nova_dsn:
           list_join:
@@ -1407,6 +1413,7 @@ resources:
                 nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
                 nova::vncproxy::host: {get_input: nova_api_network}
                 nova::db::mysql::password: {get_input: nova_password}
+                nova_enable_db_purge: {get_input: nova_enable_db_purge}
 
                 # Horizon
                 apache::ip: {get_input: horizon_network}

puppet/hieradata/controller.yaml

@@ -77,6 +77,8 @@ nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::default_floating_pool: 'public'
 nova::api::osapi_v3: true
 nova::scheduler::filter::ram_allocation_ratio: '1.0'
+nova::cron::archive_deleted_rows::hour: '*/12'
+nova::cron::archive_deleted_rows::destination: '/dev/null'
 
 # ceilometer
 ceilometer::agent::auth::auth_endpoint_type: 'internalURL'

puppet/manifests/overcloud_controller.pp

@@ -548,7 +548,12 @@ if hiera('step') >= 3 {
 } #END STEP 3
 
 if hiera('step') >= 4 {
+  $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
+
   include ::keystone::cron::token_flush
+  if $nova_enable_db_purge {
+    include ::nova::cron::archive_deleted_rows
+  }
 } #END STEP 4
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])

puppet/manifests/overcloud_controller_pacemaker.pp

@@ -968,7 +968,12 @@ if hiera('step') >= 3 {
 } #END STEP 3
 
 if hiera('step') >= 4 {
-  include ::keystone::cron::token_flush
+    $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
+
+    include ::keystone::cron::token_flush
+    if $nova_enable_db_purge {
+      include ::nova::cron::archive_deleted_rows
+    }
 
   if $pacemaker_master {