diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-05 15:21:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-05 15:21:01 +0000 |
| commit | 1dcfdab92067afe30cf26edb27f384a01b8809c2 (patch) | |
| tree | 3030fd9ea050a69750155fd7211ae23ddac25f6d /puppet/manifests | |
| parent | a491e05f9d6229f185570d1b4a07794546102515 (diff) | |
| parent | 8a4f47ca93bf7e8f1cd130084c4047c29b7e575c (diff) | |
Merge "Remove deleted Nova rows"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 5 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index a84a534b..508025cf 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/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')]) diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index d0d46e2d..de6c1b5a 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/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 { |