diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-17 13:56:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 13:56:42 -0800 |
| commit | 7e83e65fc7a76df0530a56e3f6e3897cb95c316d (patch) | |
| tree | 337096dab9658fc7413af71b7a3eb6bb98c2050a /roles/calico_master/tasks | |
| parent | fba3c1c4f3ffc1f0341a20192d392f16bf7659f4 (diff) | |
| parent | 1dc910c68f845022f8749708bf191907e11efc13 (diff) | |
| download | openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.gz openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.bz2 openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.tar.xz openshift-7e83e65fc7a76df0530a56e3f6e3897cb95c316d.zip | |
Merge pull request #6751 from vrutkovs/apply-check-rc
Automatic merge from submit-queue.
Check that rc != 0 for steps with 'failed_when'
Some parts don't check the result rc at all, some check that 'error' is present there.
Instead the safest way is to check for both
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534538
Diffstat (limited to 'roles/calico_master/tasks')
| -rw-r--r-- | roles/calico_master/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/calico_master/tasks/main.yml b/roles/calico_master/tasks/main.yml index 05415a4d6..834ebba64 100644 --- a/roles/calico_master/tasks/main.yml +++ b/roles/calico_master/tasks/main.yml @@ -23,7 +23,7 @@ -f {{ mktemp.stdout }}/calico-policy-controller.yml --config={{ openshift.common.config_base }}/master/admin.kubeconfig register: calico_create_output - failed_when: ('already exists' not in calico_create_output.stderr) and ('created' not in calico_create_output.stdout) + failed_when: "('already exists' not in calico_create_output.stderr) and ('created' not in calico_create_output.stdout) and calico_create_output.rc != 0" changed_when: ('created' in calico_create_output.stdout) - name: Calico Master | Delete temp directory |