summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-07 13:11:07 -0400
committerGitHub <noreply@github.com>2017-09-07 13:11:07 -0400
commitfae7602b75584fdecb2fcd901a63e3f37d262661 (patch)
tree8fdc7b22481552f2eca6ac99b21d7717c86c7d7d
parent6da235f41a31776b1bc253a34dc14a30307e331e (diff)
parente0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52 (diff)
downloadopenshift-fae7602b75584fdecb2fcd901a63e3f37d262661.tar.gz
openshift-fae7602b75584fdecb2fcd901a63e3f37d262661.tar.bz2
openshift-fae7602b75584fdecb2fcd901a63e3f37d262661.tar.xz
openshift-fae7602b75584fdecb2fcd901a63e3f37d262661.zip
Merge pull request #5305 from mtnbikenc/breakout-master-additional
Merged by openshift-bot
-rw-r--r--playbooks/byo/openshift-master/additional_config.yml6
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
-rw-r--r--playbooks/common/openshift-master/config.yml3
3 files changed, 8 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-master/additional_config.yml b/playbooks/byo/openshift-master/additional_config.yml
new file mode 100644
index 000000000..b3d7b5731
--- /dev/null
+++ b/playbooks/byo/openshift-master/additional_config.yml
@@ -0,0 +1,6 @@
+---
+- include: ../openshift-cluster/initialize_groups.yml
+
+- include: ../../common/openshift-cluster/std_include.yml
+
+- include: ../../common/openshift-master/additional_config.yml
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 90abf2240..3baa3c54d 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -42,6 +42,8 @@
- include: ../openshift-master/config.yml
+- include: ../openshift-master/additional_config.yml
+
- include: ../openshift-node/config.yml
tags:
- node
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 2ceb3e07e..c77d7bb87 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -217,9 +217,6 @@
group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
changed_when: False
-- include: additional_config.yml
- when: not g_openshift_master_is_scaleup
-
- name: Re-enable excluder if it was previously enabled
hosts: oo_masters_to_config
gather_facts: no