aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-07-18 10:25:27 -0400
committerEmilien Macchi <emilien@redhat.com>2016-07-19 18:45:09 +0000
commit47fe74946e556a3149eb946c491f53c7f0279442 (patch)
treec30a4db15e087ccb021a7db98c81392a8a6873d4 /puppet/manifests
parent970fcfcb58b2d0d26a39c2d9deab3a0301eb65ca (diff)
Remove ::nova::cron::archive_deleted_rows
::nova::cron::archive_deleted_rows is not called in puppet-tripleo Nova API profile. Change-Id: Idc343e481ca04b404be5311b2908f016e4517aad Depends-On: I7035f7998c11dc5508dae8c1a750b93c2944b2d4
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 c0f219c..7d332a2 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':