diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-20 21:29:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 21:29:15 -0700 |
| commit | a3906249b7a1752bb6fb42da6ceb72279fd67e90 (patch) | |
| tree | 19ae5e28c280ebe0046233184d852cfe6628d205 /playbooks/common | |
| parent | d58fe2d712e7445f55d63431968ccf00ac3df2f4 (diff) | |
| parent | 2ed396b31243a87c7c02e9338e15a83feec61e46 (diff) | |
| download | openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.gz openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.bz2 openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.xz openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.zip | |
Merge pull request #5363 from ewolinetz/default_aggregation
Automatic merge from submit-queue
Updating to always configure api aggregation with installation
This moves the wiring of the aggregator up into the config playbook as we want to enable this by default with an installation.
Resolves https://github.com/openshift/openshift-ansible/issues/5056
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 11 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/service_catalog.yml | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index bbd5a0185..fcceb37b7 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -57,6 +57,17 @@ tags: - hosted +- name: Configure API Aggregation on masters + hosts: oo_masters + serial: 1 + tasks: + - block: + - include_role: + name: openshift_service_catalog + tasks_from: wire_aggregator + vars: + first_master: "{{ groups.oo_first_master[0] }}" + - include: service_catalog.yml when: - openshift_enable_service_catalog | default(false) | bool diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml index 599350258..7bae70de1 100644 --- a/playbooks/common/openshift-cluster/service_catalog.yml +++ b/playbooks/common/openshift-cluster/service_catalog.yml @@ -1,16 +1,4 @@ --- - -- name: Update Master configs - hosts: oo_masters - serial: 1 - tasks: - - block: - - include_role: - name: openshift_service_catalog - tasks_from: wire_aggregator - vars: - first_master: "{{ groups.oo_first_master[0] }}" - - name: Service Catalog hosts: oo_first_master roles: |