diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 16:25:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 16:25:48 -0500 |
| commit | dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532 (patch) | |
| tree | 76e88ef9484f34ae0bd2ad8fc781e0cf7c2359a7 /playbooks/common | |
| parent | 5874c9f21e750fa665937d629dad0c0d34839185 (diff) | |
| parent | 85815450dbec0016e4f133c86b95b0e16f3737dc (diff) | |
| download | openshift-dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532.tar.gz openshift-dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532.tar.bz2 openshift-dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532.tar.xz openshift-dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532.zip | |
Merge pull request #6221 from mtnbikenc/consolidate-openshift-service-catalog
Playbook Consolidation - openshift-service-catalog
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/service_catalog.yml | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index c01e17115..2eeb81b86 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -29,7 +29,7 @@ - include: ../../openshift-prometheus/private/config.yml when: openshift_hosted_prometheus_deploy | default(false) | bool -- include: service_catalog.yml +- include: ../../openshift-service-catalog/private/config.yml when: openshift_enable_service_catalog | default(true) | bool - include: ../../openshift-management/private/config.yml diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml deleted file mode 100644 index 7bb8511f6..000000000 --- a/playbooks/common/openshift-cluster/service_catalog.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- name: Service Catalog Install Checkpoint Start - hosts: all - gather_facts: false - tasks: - - name: Set Service Catalog install 'In Progress' - run_once: true - set_stats: - data: - installer_phase_servicecatalog: - status: "In Progress" - start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - -- name: Service Catalog - hosts: oo_first_master - roles: - - openshift_service_catalog - - ansible_service_broker - - template_service_broker - vars: - first_master: "{{ groups.oo_first_master[0] }}" - -- name: Service Catalog Install Checkpoint End - hosts: all - gather_facts: false - tasks: - - name: Set Service Catalog install 'Complete' - run_once: true - set_stats: - data: - installer_phase_servicecatalog: - status: "Complete" - end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" |