diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-01 13:01:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 13:01:24 -0400 |
| commit | 2fdd7892232de00431601b817d428742e05efdf2 (patch) | |
| tree | 60d5c31251d99d1c3e87818966e09167e562369c /playbooks/common | |
| parent | 4a11ed0808f508d7e9d0953149377e2e181bdae9 (diff) | |
| parent | 606dc36288ef5478a9dae3f35f88e2f283d7635d (diff) | |
| download | openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.gz openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.bz2 openshift-2fdd7892232de00431601b817d428742e05efdf2.tar.xz openshift-2fdd7892232de00431601b817d428742e05efdf2.zip | |
Merge pull request #5285 from mtnbikenc/breakout-master-config
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/additional_config.yml (renamed from playbooks/common/openshift-cluster/additional_config.yml) | 0 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 7874391cc..a406b5656 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -35,12 +35,6 @@ - loadbalancer - include: ../openshift-master/config.yml - tags: - - master - -- include: additional_config.yml - tags: - - master - include: ../openshift-node/config.yml tags: diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-master/additional_config.yml index c0ea93d2c..c0ea93d2c 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-master/additional_config.yml diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 96440a2ab..b29b9ef4f 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -217,6 +217,9 @@ 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 |