summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:37:05 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-06 16:37:05 -0500
commit0fe63e0ed8af3aec27ef4aa7eeaa5866f6ebce08 (patch)
tree65621b66033088d69cfa155e7319f780bd550ea8 /roles/openshift_common/tasks
parent21caa21c84b8f5a8bec415107bb7a6b6a2082790 (diff)
parente7b200a24816daf05da374ccfce3a4d5db66e291 (diff)
downloadopenshift-0fe63e0ed8af3aec27ef4aa7eeaa5866f6ebce08.tar.gz
openshift-0fe63e0ed8af3aec27ef4aa7eeaa5866f6ebce08.tar.bz2
openshift-0fe63e0ed8af3aec27ef4aa7eeaa5866f6ebce08.tar.xz
openshift-0fe63e0ed8af3aec27ef4aa7eeaa5866f6ebce08.zip
Merge pull request #698 from lebauce/flannel
Add support for flannel
Diffstat (limited to 'roles/openshift_common/tasks')
-rw-r--r--roles/openshift_common/tasks/main.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index 73bd28630..38d5a08e4 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -1,4 +1,8 @@
---
+- fail:
+ msg: Flannel can not be used with openshift sdn
+ when: openshift_use_openshift_sdn | default(false) | bool and openshift_use_flannel | default(false) | bool
+
- name: Set common Cluster facts
openshift_facts:
role: common
@@ -13,6 +17,7 @@
sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}"
deployment_type: "{{ openshift_deployment_type }}"
use_fluentd: "{{ openshift_use_fluentd | default(None) }}"
+ use_flannel: "{{ openshift_use_flannel | default(None) }}"
- name: Set hostname
hostname: name={{ openshift.common.hostname }}