Merge "Remove ::nova::cron::archive_deleted_rows"

puppet/hieradata/controller.yaml

@@ -114,8 +114,6 @@ nova::notify_on_state_change: 'vm_and_task_state'
 nova::api::default_floating_pool: 'public'
 nova::api::sync_db_api: true
 nova::api::enable_proxy_headers_parsing: true
-nova::cron::archive_deleted_rows::hour: '*/12'
-nova::cron::archive_deleted_rows::destination: '/dev/null'
 nova::notification_driver: messaging
 
 # ceilometer

puppet/manifests/overcloud_controller.pp

@@ -54,13 +54,5 @@ if hiera('step') >= 4 {
 
 } #END STEP 4
 
-if hiera('step') >= 5 {
-  $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-
-  if $nova_enable_db_purge {
-    include ::nova::cron::archive_deleted_rows
-  }
-} #END STEP 5
-
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
 package_manifest{$package_manifest_name: ensure => present}

puppet/manifests/overcloud_controller_pacemaker.pp

@@ -87,11 +87,6 @@ if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
 } #END STEP 4
 
 if hiera('step') >= 5 {
-  $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-  if $nova_enable_db_purge {
-    include ::nova::cron::archive_deleted_rows
-  }
-
   if $pacemaker_master {
 
     pacemaker::constraint::base { 'openstack-core-then-httpd-constraint':

puppet/services/nova-api.yaml

@@ -26,6 +26,8 @@ outputs:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
           - nova::api::osapi_compute_workers: {get_param: NovaWorkers}
-          - nova::api::metadata_workers: {get_param: NovaWorkers}
+            nova::api::metadata_workers: {get_param: NovaWorkers}
+            nova::cron::archive_deleted_rows::hour: '"*/12"'
+            nova::cron::archive_deleted_rows::destination: '"/dev/null"'
       step_config: |
         include tripleo::profile::base::nova::api