aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
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/manifests
parent541631ac9092910a42f51bfbc2b7314d76299d05 (diff)
parent47fe74946e556a3149eb946c491f53c7f0279442 (diff)
Merge "Remove ::nova::cron::archive_deleted_rows"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp8
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp5
2 files changed, 0 insertions, 13 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a635ef7..3778271 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 17b64cb..3a6370e 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':