Playbook Consolidation - openshift-metrics

playbooks/aws/openshift-cluster/hosted.yml

@@ -1,7 +1,7 @@
 ---
 - include: ../../common/openshift-cluster/openshift_hosted.yml
 
-- include: ../../common/openshift-cluster/openshift_metrics.yml
+- include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
 - include: ../../common/openshift-cluster/openshift_logging.yml

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

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

playbooks/common/openshift-cluster/config.yml

@@ -20,7 +20,7 @@
 
 - include: openshift_hosted.yml
 
-- include: openshift_metrics.yml
+- include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
 - include: openshift_logging.yml

playbooks/openshift-metrics/config.yml

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

playbooks/openshift-metrics/private/library

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

playbooks/openshift-metrics/private/roles

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

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -82,7 +82,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_metrics': {
                 'title': 'Metrics Install',
-                'playbook': 'playbooks/byo/openshift-cluster/openshift-metrics.yml'
+                'playbook': 'playbooks/openshift-metrics/config.yml'
             },
             'installer_phase_logging': {
                 'title': 'Logging Install',