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 | |
| 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')
| -rw-r--r-- | playbooks/aws/openshift-cluster/hosted.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/service-catalog.yml | 9 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-service-catalog/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/openshift-service-catalog/private/config.yml (renamed from playbooks/common/openshift-cluster/service_catalog.yml) | 0 | ||||
| l--------- | playbooks/openshift-service-catalog/private/roles | 1 |
6 files changed, 7 insertions, 11 deletions
diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml index fbef9c3d0..da7ec9d21 100644 --- a/playbooks/aws/openshift-cluster/hosted.yml +++ b/playbooks/aws/openshift-cluster/hosted.yml @@ -10,7 +10,7 @@ - include: ../../openshift-prometheus/private/config.yml when: openshift_hosted_prometheus_deploy | default(false) | bool -- include: ../../common/openshift-cluster/service_catalog.yml +- include: ../../openshift-service-catalog/private/config.yml when: openshift_enable_service_catalog | default(false) | bool - include: ../../openshift-management/private/config.yml diff --git a/playbooks/byo/openshift-cluster/service-catalog.yml b/playbooks/byo/openshift-cluster/service-catalog.yml deleted file mode 100644 index 7be63b0a5..000000000 --- a/playbooks/byo/openshift-cluster/service-catalog.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# -# This playbook is a preview of upcoming changes for installing -# Hosted logging on. See inventory/byo/hosts.*.example for the -# currently supported method. -# -- include: ../../init/main.yml - -- include: ../../common/openshift-cluster/service_catalog.yml 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/openshift-service-catalog/config.yml b/playbooks/openshift-service-catalog/config.yml new file mode 100644 index 000000000..8ee57ce8d --- /dev/null +++ b/playbooks/openshift-service-catalog/config.yml @@ -0,0 +1,4 @@ +--- +- include: ../init/main.yml + +- include: private/config.yml diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/openshift-service-catalog/private/config.yml index 7bb8511f6..7bb8511f6 100644 --- a/playbooks/common/openshift-cluster/service_catalog.yml +++ b/playbooks/openshift-service-catalog/private/config.yml diff --git a/playbooks/openshift-service-catalog/private/roles b/playbooks/openshift-service-catalog/private/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/openshift-service-catalog/private/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |