summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-02-18 15:27:07 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-02-19 12:15:18 -0500
commitee5eaa4c607262bf06c9f2e44a54ab669f2607d1 (patch)
tree08e827df658de44c105f4c1739d735b9965736f3
parent23902c7271dd39dc9d374f1c503e4eef621d3b2c (diff)
downloadopenshift-ee5eaa4c607262bf06c9f2e44a54ab669f2607d1.tar.gz
openshift-ee5eaa4c607262bf06c9f2e44a54ab669f2607d1.tar.bz2
openshift-ee5eaa4c607262bf06c9f2e44a54ab669f2607d1.tar.xz
openshift-ee5eaa4c607262bf06c9f2e44a54ab669f2607d1.zip
Fix pv/c creation failed_when.
-rw-r--r--roles/openshift_persistent_volumes/tasks/main.yml4
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