diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-19 14:47:28 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-19 14:47:28 -0500 |
| commit | 1362615fd77a3eef5d92d1fe40dcd8704688faeb (patch) | |
| tree | efd4749c47b12a6264dc09bf7063f3ece059f13a /roles/openshift_persistent_volumes | |
| parent | 8652b1791ea56b99849f38183e383332a1c7f691 (diff) | |
| parent | ee5eaa4c607262bf06c9f2e44a54ab669f2607d1 (diff) | |
| download | openshift-1362615fd77a3eef5d92d1fe40dcd8704688faeb.tar.gz openshift-1362615fd77a3eef5d92d1fe40dcd8704688faeb.tar.bz2 openshift-1362615fd77a3eef5d92d1fe40dcd8704688faeb.tar.xz openshift-1362615fd77a3eef5d92d1fe40dcd8704688faeb.zip | |
Merge pull request #1442 from abutcher/pv-failed-when
Fix pv/c creation failed_when condition
Diffstat (limited to 'roles/openshift_persistent_volumes')
| -rw-r--r-- | roles/openshift_persistent_volumes/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_persistent_volumes/tasks/main.yml b/roles/openshift_persistent_volumes/tasks/main.yml index 2455fc792..e431e978c 100644 --- a/roles/openshift_persistent_volumes/tasks/main.yml +++ b/roles/openshift_persistent_volumes/tasks/main.yml @@ -23,7 +23,7 @@ --config={{ mktemp.stdout }}/admin.kubeconfig register: pv_create_output when: persistent_volumes | length > 0 - failed_when: ('already exists' not in pv_create_output.stderr if pv_create_output.stderr else False) or ('created' not in pv_create_output.stdout if pv_create_output.stdout else False) + failed_when: ('already exists' not in pv_create_output.stderr) and ('created' not in pv_create_output.stdout) changed_when: ('created' in pv_create_output.stdout) - name: Deploy PersistentVolumeClaim definitions @@ -40,7 +40,7 @@ --config={{ mktemp.stdout }}/admin.kubeconfig register: pvc_create_output when: persistent_volume_claims | length > 0 - failed_when: ('already exists' not in pvc_create_output.stderr if pvc_create_output.stderr else False) or ('created' not in pvc_create_output.stdout if pvc_create_output.stdout else False) + failed_when: ('already exists' not in pvc_create_output.stderr) and ('created' not in pvc_create_output.stdout) changed_when: ('created' in pvc_create_output.stdout) - name: Delete temp directory |