aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-04 04:35:00 +0000
committerGerrit Code Review <review@openstack.org>2017-07-04 04:35:00 +0000
commitb5081b67e5f5a6c88c149f0cd13e0053494f6d60 (patch)
treefdd37d2de9b221c837672db61236f3ccf86c34e4 /puppet/services
parent92af39f6f22aa6ee64daa11bc6e6d5e08cdd4b19 (diff)
parentaf5eaf11337c363bdf9a126744ceddb94a80343e (diff)
Merge "Make ceilometer crontab removal idempotent"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/disabled/ceilometer-expirer-disabled.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
index 7be394b6..7110afaa 100644
--- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -36,3 +36,6 @@ outputs:
- name: Remove ceilometer expirer cron tab on upgrade
tags: step1
shell: '/usr/bin/crontab -u ceilometer -r'
+ register: remove_ceilometer_expirer_crontab
+ failed_when: remove_ceilometer_expirer_crontab.rc != 0 and remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer"
+ changed_when: remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer"