summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
-rw-r--r--playbooks/common/openshift-master/config.yml3
2 files changed, 2 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 5f420a76c..bed69fac6 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -34,6 +34,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 b29b9ef4f..96440a2ab 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