Browse Source

Merge pull request #2337 from mkumatag/rm_dup_flannel_reg

Remove duplicate flannel registration
Andrew Butcher 8 years ago
parent
commit
0af3d7cd96
1 changed files with 0 additions and 10 deletions
  1. 0 10
      playbooks/common/openshift-cluster/additional_config.yml

+ 0 - 10
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
-
-