Merge pull request #6221 from mtnbikenc/consolidate-openshift-service-catalog

Playbook Consolidation - openshift-service-catalog

playbooks/aws/openshift-cluster/hosted.yml

@@ -10,7 +10,7 @@
 - include: ../../openshift-prometheus/private/config.yml
   when: openshift_hosted_prometheus_deploy | default(false) | bool
 
-- include: ../../common/openshift-cluster/service_catalog.yml
+- include: ../../openshift-service-catalog/private/config.yml
   when: openshift_enable_service_catalog | default(false) | bool
 
 - include: ../../openshift-management/private/config.yml

playbooks/byo/openshift-cluster/service-catalog.yml

@@ -1,9 +0,0 @@
----
-#
-# 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/service_catalog.yml

playbooks/common/openshift-cluster/config.yml

@@ -29,7 +29,7 @@
 - include: ../../openshift-prometheus/private/config.yml
   when: openshift_hosted_prometheus_deploy | default(false) | bool
 
-- include: service_catalog.yml
+- include: ../../openshift-service-catalog/private/config.yml
   when: openshift_enable_service_catalog | default(true) | bool
 
 - include: ../../openshift-management/private/config.yml

playbooks/openshift-service-catalog/config.yml

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

playbooks/openshift-service-catalog/private/roles

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

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -94,7 +94,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_servicecatalog': {
                 'title': 'Service Catalog Install',
-                'playbook': 'playbooks/byo/openshift-cluster/service-catalog.yml'
+                'playbook': 'playbooks/openshift-service-catalog/config.yml'
             },
             'installer_phase_management': {
                 'title': 'Management Install',