From fdf5672a697fc132fc6248f48c1ce9e0203033a9 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Sun, 21 Aug 2016 17:22:04 +0530 Subject: Remove duplicate flannel registration --- playbooks/common/openshift-cluster/additional_config.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index e9fb3de96..ae04f0981 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -24,7 +24,3 @@ - role: cockpit when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and (osm_use_cockpit | bool or osm_use_cockpit is undefined ) - - role: flannel_register - when: openshift.common.use_flannel | bool - - -- cgit v1.2.3 From 83e021c78d10a45c0a024ab663878e7d1ab60e15 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Mon, 22 Aug 2016 23:46:43 +0530 Subject: Fix review comments --- playbooks/common/openshift-cluster/additional_config.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index ae04f0981..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: @@ -24,3 +16,5 @@ - role: cockpit when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and (osm_use_cockpit | bool or osm_use_cockpit is undefined ) + - role: flannel_register + when: openshift.common.use_flannel | bool -- cgit v1.2.3