From cf64b89433489f236dd79b69d324f001074163df Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Tue, 20 Feb 2018 16:33:05 +0100 Subject: [PATCH] Remove tags from upgrade tasks for ptp.yaml. After merging [0], the step for each upgrade_task is now handled in a 'when' condition. This patch changes all the 'tags:' in upgrade_tasks to their corresponding 'when:' statement. [0] https://review.openstack.org/#/c/510902/ Change-Id: I945a50d559c3f01506673099d69013b824721d03 --- puppet/services/time/ptp.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/puppet/services/time/ptp.yaml b/puppet/services/time/ptp.yaml index 7270637d09..e01e2208da 100644 --- a/puppet/services/time/ptp.yaml +++ b/puppet/services/time/ptp.yaml @@ -89,14 +89,18 @@ outputs: register: ntp_enabled - name: Validation shell: /usr/bin/systemctl show 'ntpd' --property ActiveState | grep '\bactive\b' - when: ntp_enabled.rc == 0 - tags: step0,validation + tags: validation + when: + - step|int == 0 + - ntp_enabled.rc == 0 - name: Stop NTP service service: name=ntpd state=stopped - when: ntp_enabled.rc == 0 - tags: step2 + when: + - step|int == 2 + - ntp_enabled.rc == 0 - name: Disable NTP service service: name=ntpd state=stopped ignore_errors: True - when: ntp_enabled.rc == 0 - tags: step2 + when: + - step|int == 2 + - ntp_enabled.rc == 0