summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-29 12:04:20 -0400
committerManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-29 12:04:20 -0400
commitc0e0802eaacb732614a58c3e056951d690ed2d09 (patch)
treef02081187243128f74b1ccc15319e48b4e80a026
parentc0cae15a08cb7418e007b8bd426d68f4c20cdac1 (diff)
downloadopenshift-c0e0802eaacb732614a58c3e056951d690ed2d09.tar.gz
openshift-c0e0802eaacb732614a58c3e056951d690ed2d09.tar.bz2
openshift-c0e0802eaacb732614a58c3e056951d690ed2d09.tar.xz
openshift-c0e0802eaacb732614a58c3e056951d690ed2d09.zip
Fix flannel check
-rw-r--r--roles/openshift_common/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index ece335fbf..6dae98f9f 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -1,7 +1,7 @@
---
- fail:
- msg: Flannel can not be used with openshift sdn
- when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_flannel | default(false) | bool
+ msg: Flannel can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use flannel
+ when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_flannel | default(false) | bool
- fail:
msg: Nuage sdn can not be used with openshift sdn