summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-17 17:40:24 -0500
committerGitHub <noreply@github.com>2017-05-17 17:40:24 -0500
commitfb1ddd1e19340783ea849f7ab7fe35bca9e74c99 (patch)
tree1d6741a74fff9e1181d4d8b193e97971827ed891 /roles/openshift_common
parent9111ee06085d647367266affbf49cf57938dacfa (diff)
parentb00eee942ed6e0e366910e409e319606c3d38d78 (diff)
downloadopenshift-fb1ddd1e19340783ea849f7ab7fe35bca9e74c99.tar.gz
openshift-fb1ddd1e19340783ea849f7ab7fe35bca9e74c99.tar.bz2
openshift-fb1ddd1e19340783ea849f7ab7fe35bca9e74c99.tar.xz
openshift-fb1ddd1e19340783ea849f7ab7fe35bca9e74c99.zip
Merge pull request #4127 from VincentS/Calico_Additional_Checks
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_common')
-rw-r--r--roles/openshift_common/tasks/main.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index d9ccf87bc..51313a258 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/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: The Calico playbook does not yet integrate with the Flannel playbook 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