summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-10-02 09:17:31 -0400
committerRussell Teague <rteague@redhat.com>2017-10-02 09:17:31 -0400
commit01035ace6e1a9a143eb015bddbc435c03cf4a3ce (patch)
tree218da5c975a31e4177bbb3c4b441f976e0dea671
parent54ea443f4ad24ad311c0a036cf283f9e39c865ee (diff)
downloadopenshift-01035ace6e1a9a143eb015bddbc435c03cf4a3ce.tar.gz
openshift-01035ace6e1a9a143eb015bddbc435c03cf4a3ce.tar.bz2
openshift-01035ace6e1a9a143eb015bddbc435c03cf4a3ce.tar.xz
openshift-01035ace6e1a9a143eb015bddbc435c03cf4a3ce.zip
Fix Prometheus byo entry point
-rw-r--r--playbooks/byo/openshift-cluster/openshift-prometheus.yml2
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml1
-rw-r--r--playbooks/common/openshift-cluster/openshift_prometheus.yml1
3 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/openshift-prometheus.yml b/playbooks/byo/openshift-cluster/openshift-prometheus.yml
index 15917078d..4d3f7f42c 100644
--- a/playbooks/byo/openshift-cluster/openshift-prometheus.yml
+++ b/playbooks/byo/openshift-cluster/openshift-prometheus.yml
@@ -1,4 +1,6 @@
---
- include: initialize_groups.yml
+- include: ../../common/openshift-cluster/std_include.yml
+
- include: ../../common/openshift-cluster/openshift_prometheus.yml
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index b9eb380d3..32e5e708a 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -23,6 +23,7 @@
- include: cockpit-ui.yml
- include: openshift_prometheus.yml
+ when: openshift_hosted_prometheus_deploy | default(False) | bool
- name: Hosted Install Checkpoint End
hosts: localhost
diff --git a/playbooks/common/openshift-cluster/openshift_prometheus.yml b/playbooks/common/openshift-cluster/openshift_prometheus.yml
index ed89d3bde..ac2d250a3 100644
--- a/playbooks/common/openshift-cluster/openshift_prometheus.yml
+++ b/playbooks/common/openshift-cluster/openshift_prometheus.yml
@@ -3,4 +3,3 @@
hosts: oo_first_master
roles:
- role: openshift_prometheus
- when: openshift_hosted_prometheus_deploy | default(False) | bool