diff --git a/manifests/cron/archive_deleted_rows.pp b/manifests/cron/archive_deleted_rows.pp index b8335462e..9574977f9 100644 --- a/manifests/cron/archive_deleted_rows.pp +++ b/manifests/cron/archive_deleted_rows.pp @@ -45,18 +45,23 @@ # (optional) User with access to nova files. # 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 ( - $minute = 1, - $hour = 0, - $monthday = '*', - $month = '*', - $weekday = '*', - $max_rows = '100', - $user = 'nova', + $minute = 1, + $hour = 0, + $monthday = '*', + $month = '*', + $weekday = '*', + $max_rows = '100', + $user = 'nova', + $destination = '/var/log/nova/nova-rowsflush.log' ) { 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', user => $user, minute => $minute, diff --git a/spec/classes/nova_cron_archive_deleted_rows_spec.rb b/spec/classes/nova_cron_archive_deleted_rows_spec.rb index a1e724fa0..c1f89dc30 100644 --- a/spec/classes/nova_cron_archive_deleted_rows_spec.rb +++ b/spec/classes/nova_cron_archive_deleted_rows_spec.rb @@ -6,16 +6,27 @@ describe 'nova::cron::archive_deleted_rows' do { :osfamily => 'Debian' } 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 100 >>/var/log/nova/nova-rowsflush.log 2>&1', - :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh', - :user => 'nova', - :minute => 1, + let :params do + { :minute => 1, :hour => 0, :monthday => '*', :month => '*', :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]', ) end