summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
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 /playbooks/common/openshift-master
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 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 64376040f..b1da85d5d 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -338,6 +338,14 @@
when: ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and
(osm_use_cockpit | bool or osm_use_cockpit is undefined )
+- name: Configure flannel
+ hosts: oo_first_master
+ vars:
+ etcd_urls: "{{ openshift.master.etcd_urls }}"
+ roles:
+ - role: flannel_register
+ when: openshift.common.use_flannel | bool
+
# Additional instance config for online deployments
- name: Additional instance config
hosts: oo_masters_deployment_type_online