diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-11 13:51:05 -0500 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-20 16:36:23 -0500 |
| commit | 2ed396b31243a87c7c02e9338e15a83feec61e46 (patch) | |
| tree | db2d24f127164a7ec3ccc6f788e0d8fef7fe28d2 /playbooks/common/openshift-cluster | |
| parent | 4f5839e585a78243eae2d215176047299c52a1eb (diff) | |
| download | openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.gz openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.bz2 openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.xz openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.zip | |
Updating to always configure api aggregation with installation
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -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: |