diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 10:59:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 10:59:04 -0500 |
| commit | da85fd6aa7d71f97bfcaad3a2003921a5581a067 (patch) | |
| tree | f486fb4f71b84c01230e505e90edc09517cbb3c2 /playbooks/common/openshift-cluster/config.yml | |
| parent | 21823fcfbe1a435264c3574806c6f38dd8ddc57f (diff) | |
| parent | a495780e61e824dddeaf35b9d58b6b37e300505c (diff) | |
| download | openshift-da85fd6aa7d71f97bfcaad3a2003921a5581a067.tar.gz openshift-da85fd6aa7d71f97bfcaad3a2003921a5581a067.tar.bz2 openshift-da85fd6aa7d71f97bfcaad3a2003921a5581a067.tar.xz openshift-da85fd6aa7d71f97bfcaad3a2003921a5581a067.zip | |
Merge pull request #6217 from mtnbikenc/consolidate-openshift-hosted
Playbook Consolidation - openshift-hosted
Diffstat (limited to 'playbooks/common/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index fce5b652d..1a4ed9441 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -18,7 +18,7 @@ - include: ../openshift-glusterfs/config.yml when: groups.oo_glusterfs_to_config | default([]) | count > 0 -- include: openshift_hosted.yml +- include: ../../openshift-hosted/private/config.yml - include: ../../openshift-metrics/private/config.yml when: openshift_metrics_install_metrics | default(false) | bool @@ -26,6 +26,9 @@ - include: openshift_logging.yml when: openshift_logging_install_logging | default(false) | bool +- include: ../../openshift-prometheus/private/config.yml + when: openshift_hosted_prometheus_deploy | default(false) | bool + - include: service_catalog.yml when: openshift_enable_service_catalog | default(true) | bool |