Merge pull request #6154 from mtnbikenc/consolidate-openshift-logging

Playbook Consolidation - openshift-logging

playbooks/aws/openshift-cluster/hosted.yml

@@ -4,7 +4,7 @@
 - include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
-- include: ../../common/openshift-cluster/openshift_logging.yml
+- include: ../../openshift-logging/private/config.yml
   when: openshift_logging_install_logging | default(false) | bool
 
 - include: ../../openshift-prometheus/private/config.yml

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

@@ -1,9 +1,3 @@
 ---
-#
-# This playbook is a preview of upcoming changes for installing
-# Hosted logging on.  See inventory/byo/hosts.*.example for the
-# currently supported method.
-#
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-cluster/openshift_logging.yml
+# TODO (rteague): Temporarily leaving this playbook to allow CI tests to operate until CI jobs are updated.
+- include: ../../openshift-logging/config.yml

playbooks/common/openshift-cluster/config.yml

@@ -23,7 +23,7 @@
 - include: ../../openshift-metrics/private/config.yml
   when: openshift_metrics_install_metrics | default(false) | bool
 
-- include: openshift_logging.yml
+- include: ../../openshift-logging/private/config.yml
   when: openshift_logging_install_logging | default(false) | bool
 
 - include: ../../openshift-prometheus/private/config.yml

playbooks/openshift-logging/config.yml

@@ -0,0 +1,9 @@
+---
+#
+# This playbook is a preview of upcoming changes for installing
+# Hosted logging on.  See inventory/byo/hosts.*.example for the
+# currently supported method.
+#
+- include: ../init/main.yml
+
+- include: private/config.yml

playbooks/openshift-logging/private/library

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

playbooks/openshift-logging/private/roles

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

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -86,7 +86,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_logging': {
                 'title': 'Logging Install',
-                'playbook': 'playbooks/byo/openshift-cluster/openshift-logging.yml'
+                'playbook': 'playbooks/openshift-logging/config.yml'
             },
             'installer_phase_prometheus': {
                 'title': 'Prometheus Install',