openstack/puppet-nova
Code Issues Proposed changes

Allow to change archive destination

Browse Source 
Adds 'destination' parameter to nova::cron::archive_deleted_rows

Change-Id: Ic674f4d39bc88f89abfeb0ce99a571c2534e57e4
This commit is contained in:
Martin Mágr
2015-07-31 16:14:56 +02:00
parent 3543216ded
commit 459d075c61
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/cron/archive_deleted_rows.pp
View File

@@ -45,18 +45,23 @@
# (optional) User with access to nova files. # (optional) User with access to nova files.
# Defaults to 'nova'. # Defaults to 'nova'.
# #
# [*destination*]
# (optional) Path to file to which rows should be archived
# Defaults to '/var/log/nova/nova-rowsflush.log'.
#
class nova::cron::archive_deleted_rows ( class nova::cron::archive_deleted_rows (
$minute = 1, $minute = 1,
$hour = 0, $hour = 0,
$monthday = '*', $monthday = '*',
$month = '*', $month = '*',
$weekday = '*', $weekday = '*',
$max_rows = '100', $max_rows = '100',
$user = 'nova', $user = 'nova',
$destination = '/var/log/nova/nova-rowsflush.log'
) { ) {
cron { 'nova-manage db archive_deleted_rows': cron { 'nova-manage db archive_deleted_rows':
command => "nova-manage db archive_deleted_rows --max_rows ${max_rows} >>/var/log/nova/nova-rowsflush.log 2>&1", command => "nova-manage db archive_deleted_rows --max_rows ${max_rows} >>${destination} 2>&1",
environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh', environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
user => $user, user => $user,
minute => $minute, minute => $minute,

23
spec/classes/nova_cron_archive_deleted_rows_spec.rb
View File

@@ -6,16 +6,27 @@ describe 'nova::cron::archive_deleted_rows' do
{ :osfamily => 'Debian' } { :osfamily => 'Debian' }
end end
it 'configures a cron' do let :params do
is_expected.to contain_cron('nova-manage db archive_deleted_rows').with( { :minute => 1,
:command => 'nova-manage db archive_deleted_rows --max_rows 100 >>/var/log/nova/nova-rowsflush.log 2>&1',
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => 'nova',
:minute => 1,
:hour => 0, :hour => 0,
:monthday => '*', :monthday => '*',
:month => '*', :month => '*',
:weekday => '*', :weekday => '*',
:max_rows => '100',
:user => 'nova',
:destination => '/var/log/nova/nova-rowsflush.log' }
end
it 'configures a cron' do
is_expected.to contain_cron('nova-manage db archive_deleted_rows').with(
:command => "nova-manage db archive_deleted_rows --max_rows #{params[:max_rows]} >>#{params[:destination]} 2>&1",
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => params[:user],
:minute => params[:minute],
:hour => params[:hour],
:monthday => params[:monthday],
:month => params[:month],
:weekday => params[:weekday],
:require => 'Package[nova-common]', :require => 'Package[nova-common]',
) )
end end