From 81b056f1c8027b2cde9da6d6577430407eb28404 Mon Sep 17 00:00:00 2001
From: Martin Mágr <mmagr@redhat.com>
Date: Tue, 4 Aug 2015 14:00:11 +0200
Subject: 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
---
 puppet/controller.yaml                             |  7 +++++++
 puppet/hieradata/controller.yaml                   |  1 +
 puppet/manifests/overcloud_controller.pp           |  4 ++++
 puppet/manifests/overcloud_controller_pacemaker.pp | 14 +++++++++-----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 0d5443b9..cf31480f 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -39,6 +39,11 @@ parameters:
     default: 0
     description: Number of workers for Ceilometer service.
     type: number
+  CinderEnableDBPurge:
+    default: true
+    description: |
+      Whether to create cron job for purging soft deleted rows in Cinder database.
+    type: boolean
   CinderEnableNfsBackend:
     default: false
     description: Whether to enable or not the NFS backend for Cinder
@@ -868,6 +873,7 @@ resources:
         admin_token: {get_param: AdminToken}
         neutron_public_interface_ip: {get_param: NeutronPublicInterfaceIP}
         debug: {get_param: Debug}
+        cinder_enable_db_purge: {get_param: CinderEnableDBPurge}
         cinder_enable_nfs_backend: {get_param: CinderEnableNfsBackend}
         cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
         cinder_nfs_mount_options: {get_param: CinderNfsMountOptions}
@@ -1193,6 +1199,7 @@ resources:
                 tripleo::ringbuilder::build_ring: True
 
                 # Cinder
+                cinder_enable_db_purge: {get_input: cinder_enable_db_purge}
                 cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend}
                 cinder_enable_rbd_backend: {get_input: cinder_enable_rbd_backend}
                 cinder_nfs_mount_options: {get_input: cinder_nfs_mount_options}
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index c9f3a417..1e7f9a6a 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -85,6 +85,7 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
 
 # cinder
 cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
+cinder::cron::db_purge::destination: '/dev/null'
 
 # heat
 heat::engine::configure_delegated_roles: false
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 {
 
-- 
cgit 1.2.3-korg