Make ceilometer crontab removal idempotent

When we re-execute an upgrade and the crontab has already been
removed, the crontab removal returns 1, saying "no crontab for
ceilometer", and the upgrade fails. This change makes the removal
idempotent.

Change-Id: Ic955fb67bb2f7afde44291f7db3293c88f167566
Closes-Bug: #1701250

diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
index 7be394b..7110afa 100644 (file)
--- 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"