expirer: remove the crontab if enable_cron is False
Allow to let Puppet removing the crontab when ceilometer::expirer::enable_cron is set to False. It's useful when you want to upgrade from Ocata to Pike and you want the crontab to be removed, since ceilometer-expirer is deprecated in Pike. Change-Id: I1eb243be7bbc38ab5977bcf6a649e98eb6ff77f7
This commit is contained in:
parent
3d45585f8f
commit
1ef657da0e
|
@ -23,6 +23,8 @@
|
||||||
#
|
#
|
||||||
# [*enable_cron*]
|
# [*enable_cron*]
|
||||||
# (optional) Whether to configure a crontab entry to run the expiry.
|
# (optional) Whether to configure a crontab entry to run the expiry.
|
||||||
|
# When set to False, Puppet will try to remove the crontab.
|
||||||
|
# It's useful when we upgrade from Ocata to Pike and want to remove it.
|
||||||
# Defaults to true.
|
# Defaults to true.
|
||||||
#
|
#
|
||||||
# [*minute*]
|
# [*minute*]
|
||||||
|
@ -54,16 +56,21 @@ class ceilometer::expirer (
|
||||||
Anchor['ceilometer::install::end'] ~> Class['ceilometer::expirer']
|
Anchor['ceilometer::install::end'] ~> Class['ceilometer::expirer']
|
||||||
|
|
||||||
if $enable_cron {
|
if $enable_cron {
|
||||||
cron { 'ceilometer-expirer':
|
$ensure = 'present'
|
||||||
command => $ceilometer::params::expirer_command,
|
} else {
|
||||||
environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
$ensure = 'absent'
|
||||||
user => 'ceilometer',
|
}
|
||||||
minute => $minute,
|
|
||||||
hour => $hour,
|
cron { 'ceilometer-expirer':
|
||||||
monthday => $monthday,
|
ensure => $ensure,
|
||||||
month => $month,
|
command => $ceilometer::params::expirer_command,
|
||||||
weekday => $weekday
|
environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
}
|
user => 'ceilometer',
|
||||||
|
minute => $minute,
|
||||||
|
hour => $hour,
|
||||||
|
monthday => $monthday,
|
||||||
|
month => $month,
|
||||||
|
weekday => $weekday
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- When ceilometer::expirer::enable_cron is set to False, Puppet will
|
||||||
|
try to remove the crontab. It's useful when you upgrade from Ocata
|
||||||
|
to Pike and you want the crontab to be removed (the service is deprecated).
|
|
@ -44,6 +44,7 @@ describe 'ceilometer::expirer' do
|
||||||
|
|
||||||
it 'configures a cron' do
|
it 'configures a cron' do
|
||||||
is_expected.to contain_cron('ceilometer-expirer').with(
|
is_expected.to contain_cron('ceilometer-expirer').with(
|
||||||
|
:ensure => 'present',
|
||||||
:command => 'ceilometer-expirer',
|
:command => 'ceilometer-expirer',
|
||||||
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
:user => 'ceilometer',
|
:user => 'ceilometer',
|
||||||
|
@ -60,7 +61,19 @@ describe 'ceilometer::expirer' do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:enable_cron => false })
|
:enable_cron => false })
|
||||||
end
|
end
|
||||||
it { is_expected.to_not contain_cron('ceilometer-expirer') }
|
it {
|
||||||
|
is_expected.to contain_cron('ceilometer-expirer').with(
|
||||||
|
:ensure => 'absent',
|
||||||
|
:command => 'ceilometer-expirer',
|
||||||
|
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
|
||||||
|
:user => 'ceilometer',
|
||||||
|
:minute => 1,
|
||||||
|
:hour => 0,
|
||||||
|
:monthday => '*',
|
||||||
|
:month => '*',
|
||||||
|
:weekday => '*'
|
||||||
|
)
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue