summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-08-25 09:22:45 -0400
committerGitHub <noreply@github.com>2016-08-25 09:22:45 -0400
commit0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5 (patch)
tree032964e29bc1aa2eac7e6b94856acb35065652bd
parent64079896662ae87bd758742a2a9e81a84505c871 (diff)
parent83e021c78d10a45c0a024ab663878e7d1ab60e15 (diff)
downloadopenshift-0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5.tar.gz
openshift-0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5.tar.bz2
openshift-0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5.tar.xz
openshift-0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5.zip
Merge pull request #2337 from mkumatag/rm_dup_flannel_reg
Remove duplicate flannel registration
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml10
1 files changed, 0 insertions, 10 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index e9fb3de96..ebbd45a67 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/playbooks/common/openshift-cluster/additional_config.yml
@@ -1,11 +1,3 @@
-- name: Configure flannel
- hosts: oo_first_master
- vars:
- etcd_urls: "{{ openshift.master.etcd_urls }}"
- roles:
- - role: flannel_register
- when: openshift.common.use_flannel | bool
-
- name: Additional master configuration
hosts: oo_first_master
vars:
@@ -26,5 +18,3 @@
(osm_use_cockpit | bool or osm_use_cockpit is undefined )
- role: flannel_register
when: openshift.common.use_flannel | bool
-
-