summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-22 23:46:43 +0530
committerManjunath A Kumatagi <mkumatag@in.ibm.com>2016-08-22 23:46:43 +0530
commit83e021c78d10a45c0a024ab663878e7d1ab60e15 (patch)
tree81a74350639560fabca14b9c66fd7685283c6d67 /playbooks/common
parentfdf5672a697fc132fc6248f48c1ce9e0203033a9 (diff)
downloadopenshift-83e021c78d10a45c0a024ab663878e7d1ab60e15.tar.gz
openshift-83e021c78d10a45c0a024ab663878e7d1ab60e15.tar.bz2
openshift-83e021c78d10a45c0a024ab663878e7d1ab60e15.tar.xz
openshift-83e021c78d10a45c0a024ab663878e7d1ab60e15.zip
Fix review comments
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml10
1 files changed, 2 insertions, 8 deletions
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