diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 09:15:40 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-11-22 11:10:59 -0500 |
| commit | 85815450dbec0016e4f133c86b95b0e16f3737dc (patch) | |
| tree | 395139a495f8f125d312283201368d25fcc6ef4d /playbooks/common | |
| parent | 012be35217f7415d50afe5e74b7e2e995feea6b5 (diff) | |
| download | openshift-85815450dbec0016e4f133c86b95b0e16f3737dc.tar.gz openshift-85815450dbec0016e4f133c86b95b0e16f3737dc.tar.bz2 openshift-85815450dbec0016e4f133c86b95b0e16f3737dc.tar.xz openshift-85815450dbec0016e4f133c86b95b0e16f3737dc.zip | |
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 de2c7b813..5a5a01804 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/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') }}" |