diff options
| author | Russell Teague <rteague@redhat.com> | 2017-09-05 11:22:34 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-09-05 11:28:12 -0400 |
| commit | e0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52 (patch) | |
| tree | 7ac808bc4b301f430b553fad61056db162052c93 | |
| parent | 4acf08d76c406c34ffa8d305a3413d8fd68a4d45 (diff) | |
| download | openshift-e0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52.tar.gz openshift-e0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52.tar.bz2 openshift-e0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52.tar.xz openshift-e0bfbf5962e4d75e51d15d0ac15c0d8c04a1ea52.zip | |
Move master additional config out of base
| -rw-r--r-- | playbooks/byo/openshift-master/additional_config.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 3 |
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 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 |