From 85815450dbec0016e4f133c86b95b0e16f3737dc Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Wed, 22 Nov 2017 09:15:40 -0500
Subject: Playbook Consolidation - openshift-service-catalog

---
 playbooks/aws/openshift-cluster/hosted.yml         |  2 +-
 .../byo/openshift-cluster/service-catalog.yml      |  9 ------
 playbooks/common/openshift-cluster/config.yml      |  2 +-
 .../common/openshift-cluster/service_catalog.yml   | 33 ----------------------
 playbooks/openshift-service-catalog/config.yml     |  4 +++
 .../openshift-service-catalog/private/config.yml   | 33 ++++++++++++++++++++++
 playbooks/openshift-service-catalog/private/roles  |  1 +
 7 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 playbooks/byo/openshift-cluster/service-catalog.yml
 delete mode 100644 playbooks/common/openshift-cluster/service_catalog.yml
 create mode 100644 playbooks/openshift-service-catalog/config.yml
 create mode 100644 playbooks/openshift-service-catalog/private/config.yml
 create mode 120000 playbooks/openshift-service-catalog/private/roles

(limited to 'playbooks')

diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml
index 32139e150..cf5befc7c 100644
--- a/playbooks/aws/openshift-cluster/hosted.yml
+++ b/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: ../../common/openshift-management/config.yml
diff --git a/playbooks/byo/openshift-cluster/service-catalog.yml b/playbooks/byo/openshift-cluster/service-catalog.yml
deleted file mode 100644
index 7be63b0a5..000000000
--- a/playbooks/byo/openshift-cluster/service-catalog.yml
+++ /dev/null
@@ -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
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index de2c7b813..5a5a01804 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/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/config.yml
diff --git a/playbooks/common/openshift-cluster/service_catalog.yml b/playbooks/common/openshift-cluster/service_catalog.yml
deleted file mode 100644
index 7bb8511f6..000000000
--- a/playbooks/common/openshift-cluster/service_catalog.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- name: Service Catalog Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Service Catalog install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_servicecatalog:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Service Catalog
-  hosts: oo_first_master
-  roles:
-  - openshift_service_catalog
-  - ansible_service_broker
-  - template_service_broker
-  vars:
-    first_master: "{{ groups.oo_first_master[0] }}"
-
-- name: Service Catalog Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Service Catalog install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_servicecatalog:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/openshift-service-catalog/config.yml b/playbooks/openshift-service-catalog/config.yml
new file mode 100644
index 000000000..8ee57ce8d
--- /dev/null
+++ b/playbooks/openshift-service-catalog/config.yml
@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml
diff --git a/playbooks/openshift-service-catalog/private/config.yml b/playbooks/openshift-service-catalog/private/config.yml
new file mode 100644
index 000000000..7bb8511f6
--- /dev/null
+++ b/playbooks/openshift-service-catalog/private/config.yml
@@ -0,0 +1,33 @@
+---
+- name: Service Catalog Install Checkpoint Start
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Service Catalog install 'In Progress'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_servicecatalog:
+          status: "In Progress"
+          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
+- name: Service Catalog
+  hosts: oo_first_master
+  roles:
+  - openshift_service_catalog
+  - ansible_service_broker
+  - template_service_broker
+  vars:
+    first_master: "{{ groups.oo_first_master[0] }}"
+
+- name: Service Catalog Install Checkpoint End
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Service Catalog install 'Complete'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_servicecatalog:
+          status: "Complete"
+          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/openshift-service-catalog/private/roles b/playbooks/openshift-service-catalog/private/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/openshift-service-catalog/private/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
-- 
cgit v1.2.3