Explorar o código

Added additional Calico Network Plugin Checks

Vincent Schwarzer %!s(int64=8) %!d(string=hai) anos
pai
achega
3cce846f28
Modificáronse 1 ficheiros con 9 adicións e 1 borrados
  1. 9 1
      roles/openshift_common/tasks/main.yml

+ 9 - 1
roles/openshift_common/tasks/main.yml

@@ -28,10 +28,18 @@
   when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_calico | default(false) | bool
 
 - fail:
-    msg: Calico cannot currently be used with Flannel in Openshift. Set either openshift_use_calico or openshift_use_flannel, but not both
+    msg: Calico can not be used with Flannel in Openshift. Set either openshift_use_calico or openshift_use_flannel, but not both
   when: openshift_use_calico | default(false) | bool and openshift_use_flannel | default(false) | bool
 
 - fail:
+    msg: Calico can not be used with Nuage in Openshift. Set either openshift_use_calico or openshift_use_nuage, but not both
+  when: openshift_use_calico | default(false) | bool and openshift_use_nuage | default(false) | bool
+
+- fail:
+    msg: Calico can not be used with Contiv in Openshift. Set either openshift_use_calico or openshift_use_contiv, but not both
+  when: openshift_use_calico | default(false) | bool and openshift_use_contiv | default(false) | bool
+
+- fail:
     msg: openshift_hostname must be 64 characters or less
   when: openshift_hostname is defined and openshift_hostname | length > 64