diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-24 17:15:26 -0500 |
| commit | 8cbd53ed64f1819b8f4defbf196140a1692c5a42 (patch) | |
| tree | 7dd61610e8ea6ae373e12dbb1c894047b8feac0f /roles/openshift_metrics | |
| parent | c2de775c80b8daa629af514f24118f704c521c18 (diff) | |
| parent | 0b57e113dbf16b5ac6f01859c9c4ab2aee594f87 (diff) | |
| download | openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.gz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.bz2 openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.tar.xz openshift-8cbd53ed64f1819b8f4defbf196140a1692c5a42.zip | |
Merge branch 'master' into rm_origin-components
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/oc_apply.yaml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/roles/openshift_metrics/tasks/oc_apply.yaml b/roles/openshift_metrics/tasks/oc_apply.yaml index 057963c1a..30fdde94c 100644 --- a/roles/openshift_metrics/tasks/oc_apply.yaml +++ b/roles/openshift_metrics/tasks/oc_apply.yaml @@ -16,9 +16,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 | int != 0)" changed_when: no - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}} @@ -30,7 +28,5 @@ register: version_changed vars: init_version: "{{ (generation_init is defined) | ternary(generation_init.stdout, '0') }}" - failed_when: - - "'error' in version_changed.stderr" - - "version_changed.rc != 0" + failed_when: "'error' in version_changed.stderr or version_changed.rc | int != 0" changed_when: version_changed.stdout | int > init_version | int |