diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-01 14:50:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:50:58 -0400 |
| commit | 7d79b61c55dd941dfe2533679ba37b67704a2c23 (patch) | |
| tree | 83ff1c11414cb1230c19140376ddc56e014bb9fa /roles | |
| parent | 204568e8fda1c54c5a01dc35419260874de780ee (diff) | |
| parent | 594dc0e9e5e4a5043e72517d2c2fb4b0decf4d4b (diff) | |
| download | openshift-7d79b61c55dd941dfe2533679ba37b67704a2c23.tar.gz openshift-7d79b61c55dd941dfe2533679ba37b67704a2c23.tar.bz2 openshift-7d79b61c55dd941dfe2533679ba37b67704a2c23.tar.xz openshift-7d79b61c55dd941dfe2533679ba37b67704a2c23.zip | |
Merge pull request #2382 from abutcher/nuage-check
Fix nuage check.
Diffstat (limited to 'roles')
| -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 6dae98f9f..f10a77697 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -4,8 +4,8 @@ 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 - when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_nuage | default(false) | bool + msg: Nuage sdn can not be used with openshift sdn, set openshift_use_openshift_sdn=false if you want to use nuage + when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_nuage | default(false) | bool - fail: msg: Nuage sdn can not be used with flannel |