diff options
| author |   Martin Mágr <mmagr@redhat.com> | 2015-08-04 14:00:11 +0200 |
|---|---|---|
| committer | Martin Mágr <mmagr@redhat.com> | 2016-01-06 11:31:57 +0100 |
| commit | 81b056f1c8027b2cde9da6d6577430407eb28404 (patch) | |
| tree | 7a7f2c84d24fc777c2bbef532acd1fb4e8e135c0 /puppet/manifests | |
| parent | 6746cb80f32032d2d205ea1a7d15c2f5a06a2843 (diff) | |
Remove deleted Cinder rows
Creates cron job running every 24 hours
for "cinder-manage db purge"
Partial-bug: rhbz#1249106
Change-Id: I9156e0bf1401eda49a7c9a2921dc3a8723af026d
Depends-On: I677f2ef3d9ca81fff0f672c8e34b6e4278674a96
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 508025cf..8638d055 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -549,11 +549,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 de6c1b5a..66996f5e 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -968,12 +968,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 { |