summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-cluster
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 10:59:04 -0500
committerGitHub <noreply@github.com>2017-11-22 10:59:04 -0500
commitda85fd6aa7d71f97bfcaad3a2003921a5581a067 (patch)
treef486fb4f71b84c01230e505e90edc09517cbb3c2 /playbooks/aws/openshift-cluster
parent21823fcfbe1a435264c3574806c6f38dd8ddc57f (diff)
parenta495780e61e824dddeaf35b9d58b6b37e300505c (diff)
downloadopenshift-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/aws/openshift-cluster')
-rw-r--r--playbooks/aws/openshift-cluster/hosted.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml
index 3d3c871ca..32139e150 100644
--- a/playbooks/aws/openshift-cluster/hosted.yml
+++ b/playbooks/aws/openshift-cluster/hosted.yml
@@ -1,5 +1,5 @@
---
-- include: ../../common/openshift-cluster/openshift_hosted.yml
+- include: ../../openshift-hosted/private/config.yml
- include: ../../openshift-metrics/private/config.yml
when: openshift_metrics_install_metrics | default(false) | bool
@@ -7,6 +7,9 @@
- include: ../../common/openshift-cluster/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: ../../common/openshift-cluster/service_catalog.yml
when: openshift_enable_service_catalog | default(false) | bool