summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common/tasks
diff options
context:
space:
mode:
authorVincent Schwarzer <vincent.schwarzer@yahoo.de>2017-05-10 19:54:58 +0200
committerVincent Schwarzer <vincent.schwarzer@yahoo.de>2017-05-10 19:54:58 +0200
commitb00eee942ed6e0e366910e409e319606c3d38d78 (patch)
tree7a1c8eb146ca77e16e699428c101937ef0ac8af7 /roles/openshift_common/tasks
parent3cce846f28c5ea53d247839c9ea9587934307ab8 (diff)
downloadopenshift-b00eee942ed6e0e366910e409e319606c3d38d78.tar.gz
openshift-b00eee942ed6e0e366910e409e319606c3d38d78.tar.bz2
openshift-b00eee942ed6e0e366910e409e319606c3d38d78.tar.xz
openshift-b00eee942ed6e0e366910e409e319606c3d38d78.zip
Change based on feedback
Diffstat (limited to 'roles/openshift_common/tasks')
-rw-r--r--roles/openshift_common/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 359eaec07..51313a258 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -28,7 +28,7 @@
when: openshift_use_openshift_sdn | default(true) | bool and openshift_use_calico | default(false) | bool
- fail:
- msg: Calico can not 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: