Просмотр исходного кода

Merge pull request #2382 from abutcher/nuage-check

Fix nuage check.
Scott Dodson 8 лет назад
Родитель
Сommit
7d79b61c55
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      roles/openshift_common/tasks/main.yml

+ 2 - 2
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
   when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_flannel | default(false) | bool
 
 
 - fail:
 - 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:
 - fail:
    msg: Nuage sdn can not be used with flannel
    msg: Nuage sdn can not be used with flannel