summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-25 09:03:14 -0700
committerGitHub <noreply@github.com>2017-10-25 09:03:14 -0700
commite6ae87aa370c35b444385efe2fbab480d5cde336 (patch)
treeafa6fb74eebd124d64d91824c66213eff364e58a
parent7f60ecab99ab7efabcade03e8391a1936ac73236 (diff)
parent76d69e29bd0dadfbda1de9d2a42274a234b3616c (diff)
downloadopenshift-e6ae87aa370c35b444385efe2fbab480d5cde336.tar.gz
openshift-e6ae87aa370c35b444385efe2fbab480d5cde336.tar.bz2
openshift-e6ae87aa370c35b444385efe2fbab480d5cde336.tar.xz
openshift-e6ae87aa370c35b444385efe2fbab480d5cde336.zip
Merge pull request #5810 from zgalor/refactor-prom-entry
Automatic merge from submit-queue. Add installer checkpoint for prometheus
-rw-r--r--playbooks/common/openshift-cluster/openshift_prometheus.yml20
-rw-r--r--roles/installer_checkpoint/callback_plugins/installer_checkpoint.py7
2 files changed, 27 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_prometheus.yml b/playbooks/common/openshift-cluster/openshift_prometheus.yml
index ac2d250a3..a73b294a5 100644
--- a/playbooks/common/openshift-cluster/openshift_prometheus.yml
+++ b/playbooks/common/openshift-cluster/openshift_prometheus.yml
@@ -1,5 +1,25 @@
---
+- name: Prometheus Install Checkpoint Start
+ hosts: oo_all_hosts
+ gather_facts: false
+ tasks:
+ - name: Set Prometheus install 'In Progress'
+ set_stats:
+ data:
+ installer_phase_prometheus: "In Progress"
+ aggregate: false
+
- name: Create Hosted Resources - openshift_prometheus
hosts: oo_first_master
roles:
- role: openshift_prometheus
+
+- name: Prometheus Install Checkpoint End
+ hosts: oo_all_hosts
+ gather_facts: false
+ tasks:
+ - name: Set Prometheus install 'Complete'
+ set_stats:
+ data:
+ installer_phase_prometheus: "Complete"
+ aggregate: false
diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
index 25f9405af..55c44bb84 100644
--- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
+++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
@@ -31,6 +31,7 @@ GlusterFS Install : Not Started
Hosted Install : Complete
Metrics Install : Not Started
Logging Install : Not Started
+Prometheus Install : Not Started
Service Catalog Install : Not Started
-----------------------------------------------------
@@ -49,6 +50,7 @@ GlusterFS Install : Not Started
Hosted Install : Not Started
Metrics Install : Not Started
Logging Install : Not Started
+Prometheus Install : Not Started
Service Catalog Install : Not Started
'''
@@ -80,6 +82,7 @@ class CallbackModule(CallbackBase):
'installer_phase_hosted',
'installer_phase_metrics',
'installer_phase_logging',
+ 'installer_phase_prometheus',
'installer_phase_servicecatalog',
'installer_phase_management',
]
@@ -130,6 +133,10 @@ class CallbackModule(CallbackBase):
'title': 'Logging Install',
'playbook': 'playbooks/byo/openshift-cluster/openshift-logging.yml'
},
+ 'installer_phase_prometheus': {
+ 'title': 'Prometheus Install',
+ 'playbook': 'playbooks/byo/openshift-cluster/openshift-prometheus.yml'
+ },
'installer_phase_servicecatalog': {
'title': 'Service Catalog Install',
'playbook': 'playbooks/byo/openshift-cluster/service-catalog.yml'