aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMarius Cornea <mcornea@redhat.com>2017-08-31 10:32:30 +0200
committerEmilien Macchi <emilien@redhat.com>2017-09-06 01:15:12 +0000
commitf2d0901270b6781a5b8ed37aab47da51b79e907c (patch)
treeb074d8582757fb1ca44266a0f5acf3a9474564c8 /docker
parent9f408dbe8bc8371424ecb816877b1cfe62498f8d (diff)
Allow upgrade tasks to run when looping through steps
Currently for non controller upgrades we're looping through the upgrade steps and run the upgrade tasks based on when conditionals including the step number and the existing upgrade task condition. Some of tasks fail because the variables used in when conditionals are not available through all steps. This change adds default values to these vars where possible or creates them for all steps to avoid failures. Related-Bug: 1708115 Change-Id: I5c731043cec8e31fc82ca98972a301baa7294c4f (cherry picked from commit e2f00ef1dc98140087c81e202a520f549f9a0970)
Diffstat (limited to 'docker')
-rw-r--r--docker/services/iscsid.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index 8051980..c34a59d 100644
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -109,7 +109,7 @@ outputs:
- name: Stop and disable iscsid service
tags: step2
service: name=iscsid state=stopped enabled=no
- when: stat_iscsid_service.stat.exists
+ when: (stat_iscsid_service.stat|default('')).exists|default(false)
- name: stat /lib/systemd/system/iscsid.socket
tags: step2
stat: path=/lib/systemd/system/iscsid.socket
@@ -117,4 +117,4 @@ outputs:
- name: Stop and disable iscsid.socket service
tags: step2
service: name=iscsid.socket state=stopped enabled=no
- when: stat_iscsid_socket.stat.exists
+ when: (stat_iscsid_socket.stat|default('')).exists|default(false)