diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-07 17:23:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-07 17:23:10 +0000 |
| commit | 27cfda59e46f0614f91e13e907065511a00dab03 (patch) | |
| tree | ab4bd7d350681caa8bb88c29507b162b73fb2fd6 /puppet/manifests | |
| parent | 1e157766e4430aed80526056ede19d22c03ee5f3 (diff) | |
| parent | 81b056f1c8027b2cde9da6d6577430407eb28404 (diff) | |
Merge "Remove deleted Cinder rows"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 4 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 3248ac8d..5541734f 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -593,11 +593,15 @@ if hiera('step') >= 3 { if hiera('step') >= 4 { $nova_enable_db_purge = hiera('nova_enable_db_purge', true) + $cinder_enable_db_purge = hiera('cinder_enable_db_purge', true) include ::keystone::cron::token_flush if $nova_enable_db_purge { include ::nova::cron::archive_deleted_rows } + if $cinder_enable_db_purge { + include ::cinder::cron::db_purge + } } #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 943e7fce..3ce94315 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -1012,12 +1012,16 @@ if hiera('step') >= 3 { } #END STEP 3 if hiera('step') >= 4 { - $nova_enable_db_purge = hiera('nova_enable_db_purge', true) + $nova_enable_db_purge = hiera('nova_enable_db_purge', true) + $cinder_enable_db_purge = hiera('cinder_enable_db_purge', true) - include ::keystone::cron::token_flush - if $nova_enable_db_purge { - include ::nova::cron::archive_deleted_rows - } + include ::keystone::cron::token_flush + if $nova_enable_db_purge { + include ::nova::cron::archive_deleted_rows + } + if $cinder_enable_db_purge { + include ::cinder::cron::db_purge + } if $pacemaker_master { |