summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-03 00:14:39 -0700
committerGitHub <noreply@github.com>2017-10-03 00:14:39 -0700
commitfc415ad8f74bca0cc024e00b9bc10edcecb6e65a (patch)
treee0aa24d74f9df376d0a02c05eaa7deb2e60d8550 /playbooks
parent947712f49344eb3cd3286f1c7cca4918671383f2 (diff)
parent01035ace6e1a9a143eb015bddbc435c03cf4a3ce (diff)
downloadopenshift-fc415ad8f74bca0cc024e00b9bc10edcecb6e65a.tar.gz
openshift-fc415ad8f74bca0cc024e00b9bc10edcecb6e65a.tar.bz2
openshift-fc415ad8f74bca0cc024e00b9bc10edcecb6e65a.tar.xz
openshift-fc415ad8f74bca0cc024e00b9bc10edcecb6e65a.zip
Merge pull request #5614 from mtnbikenc/fix-prometheus
Automatic merge from submit-queue. Fix Prometheus byo entry point Adds the std_include.yml playbook to the byo entrypoint and moves the conditional install to the openshift_hosted.yml portion of an install.
Diffstat (limited to 'playbooks')
-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