diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-08-29 14:55:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 14:55:36 -0400 |
| commit | e9123c420fd80ab48b7b98c9ab8494df3fa69a5d (patch) | |
| tree | fdf628a0aba739dc70f945e2d9c774d2a6c1a507 | |
| parent | de7b46011c616dd31b9df07593b7532c643e482a (diff) | |
| parent | c0e0802eaacb732614a58c3e056951d690ed2d09 (diff) | |
| download | openshift-e9123c420fd80ab48b7b98c9ab8494df3fa69a5d.tar.gz openshift-e9123c420fd80ab48b7b98c9ab8494df3fa69a5d.tar.bz2 openshift-e9123c420fd80ab48b7b98c9ab8494df3fa69a5d.tar.xz openshift-e9123c420fd80ab48b7b98c9ab8494df3fa69a5d.zip | |
Merge pull request #2375 from mkumatag/flannel_fix
Fix flannel check
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 4 |
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 |