summaryrefslogtreecommitdiffstats
path: root/roles/openshift_provisioners/tasks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-24 07:50:46 -0800
committerGitHub <noreply@github.com>2018-01-24 07:50:46 -0800
commit0344a8f71af49cdf3827ccf6be339097369c12f7 (patch)
tree222cf7200c5bed18499f0b92661fc0ab8bfc7cea /roles/openshift_provisioners/tasks
parent3abb49892a339c25fac1a320a84ca9049ae7bc6f (diff)
parent966019481268cd0bf7b3f352cded283221c24e39 (diff)
downloadopenshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.gz
openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.bz2
openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.tar.xz
openshift-0344a8f71af49cdf3827ccf6be339097369c12f7.zip
Merge pull request #6815 from vrutkovs/failed_when-rc-to-int
Automatic merge from submit-queue. failed_when lists are implicitely ANDs, not ORs For some reason I believed `failed_when` lists are considered to be ORs, but it turns out these are ANDs. Fixes bug 1534538 Relates to #6751
Diffstat (limited to 'roles/openshift_provisioners/tasks')
-rw-r--r--roles/openshift_provisioners/tasks/oc_apply.yaml12
1 files changed, 3 insertions, 9 deletions
diff --git a/roles/openshift_provisioners/tasks/oc_apply.yaml b/roles/openshift_provisioners/tasks/oc_apply.yaml
index 239e1f1cc..27c8a4b81 100644
--- a/roles/openshift_provisioners/tasks/oc_apply.yaml
+++ b/roles/openshift_provisioners/tasks/oc_apply.yaml
@@ -15,9 +15,7 @@
apply -f {{ file_name }}
-n {{ namespace }}
register: generation_apply
- failed_when:
- - "'error' in generation_apply.stderr"
- - "generation_apply.rc != 0"
+ failed_when: "'error' in generation_apply.stderr or generation_apply.rc != 0"
changed_when: no
- name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}}
@@ -38,9 +36,7 @@
delete -f {{ file_name }}
-n {{ namespace }}
register: generation_delete
- failed_when:
- - "'error' in generation_delete.stderr"
- - "generation_delete.rc != 0"
+ failed_when: "'error' in generation_delete.stderr or generation_delete.rc != 0"
changed_when: generation_delete.rc == 0
when: generation_apply.rc != 0
@@ -50,8 +46,6 @@
apply -f {{ file_name }}
-n {{ namespace }}
register: generation_apply
- failed_when:
- - "'error' in generation_apply.stderr"
- - "generation_apply.rc != 0"
+ failed_when: "'error' in generation_apply.stderr or generation_apply.rc | int != 0"
changed_when: generation_apply.rc == 0
when: generation_apply.rc != 0