Playbook Consolidation - openshift-hosted

playbooks/aws/openshift-cluster/hosted.yml

@@ -1,5 +1,5 @@
 ---
-- include: ../../common/openshift-cluster/openshift_hosted.yml
+- include: ../../openshift-hosted/private/config.yml
 
 - include: ../../common/openshift-cluster/openshift_metrics.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
 

playbooks/byo/openshift-cluster/openshift-hosted.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_hosted.yml

playbooks/byo/openshift-cluster/openshift-prometheus.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_prometheus.yml

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.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
 

playbooks/openshift-hosted/config.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml

playbooks/common/openshift-cluster/openshift_hosted.yml

@@ -23,9 +23,6 @@
 
 - include: cockpit-ui.yml
 
-- include: openshift_prometheus.yml
-  when: openshift_hosted_prometheus_deploy | default(False) | bool
-
 - include: install_docker_gc.yml
   when:
   - openshift_use_crio | default(False) | bool

playbooks/openshift-hosted/private/roles

@@ -0,0 +1 @@
+../../../roles

playbooks/openshift-prometheus/config.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml

playbooks/common/openshift-cluster/openshift_prometheus.yml

@@ -11,7 +11,7 @@
           status: "In Progress"
           start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- name: Create Hosted Resources - openshift_prometheus
+- name: OpenShift Prometheus
   hosts: oo_first_master
   roles:
   - role: openshift_prometheus

playbooks/openshift-prometheus/private/roles

@@ -0,0 +1 @@
+../../../roles

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -78,7 +78,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_hosted': {
                 'title': 'Hosted Install',
-                'playbook': 'playbooks/byo/openshift-cluster/openshift-hosted.yml'
+                'playbook': 'playbooks/openshift-hosted/config.yml'
             },
             'installer_phase_metrics': {
                 'title': 'Metrics Install',
@@ -90,7 +90,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_prometheus': {
                 'title': 'Prometheus Install',
-                'playbook': 'playbooks/byo/openshift-cluster/openshift-prometheus.yml'
+                'playbook': 'playbooks/openshift-prometheus/config.yml'
             },
             'installer_phase_servicecatalog': {
                 'title': 'Service Catalog Install',