From 966019481268cd0bf7b3f352cded283221c24e39 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 22 Jan 2018 17:26:36 +0100 Subject: failed_when lists are implicitely ANDs, not ORs See https://github.com/ansible/ansible/issues/18311#issuecomment-258048690 --- roles/openshift_metrics/tasks/oc_apply.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'roles/openshift_metrics') 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 -- cgit v1.2.1