aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-21 14:05:26 +0000
committerGerrit Code Review <review@openstack.org>2016-07-21 14:05:26 +0000
commit393db0231fa4b3b61b65c0ac6f031950e415d58d (patch)
tree5d8f65fafc7345c26c305ff6981c8717a0955f6c /puppet
parent541631ac9092910a42f51bfbc2b7314d76299d05 (diff)
parent47fe74946e556a3149eb946c491f53c7f0279442 (diff)
Merge "Remove ::nova::cron::archive_deleted_rows"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml2
-rw-r--r--puppet/manifests/overcloud_controller.pp8
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp5
-rw-r--r--puppet/services/nova-api.yaml4
4 files changed, 3 insertions, 16 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 94f57c8a..072c7c0d 100644
--- a/puppet/hieradata/controller.yaml
+++ b/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
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a635ef73..3778271c 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/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}
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 17b64cb2..3a6370e4 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/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':
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index f31df371..0ff159d2 100644
--- a/puppet/services/nova-api.yaml
+++ b/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