Playbook Consolidation - openshift-management

7 files changed, 1 insertions, 59 deletions

diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index fce5b652d..a98b1df5f 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -29,7 +29,7 @@
 - include: service_catalog.yml
   when: openshift_enable_service_catalog | default(true) | bool
 
-- include: ../openshift-management/config.yml
+- include: ../../openshift-management/private/config.yml
   when: openshift_management_install_management | default(false) | bool
 
 - name: Print deprecated variable warning message if necessary
diff --git a/playbooks/common/openshift-management/add_container_provider.yml b/playbooks/common/openshift-management/add_container_provider.yml
deleted file mode 100644
index facb3a5b9..000000000
--- a/playbooks/common/openshift-management/add_container_provider.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Add Container Provider to Management
-  hosts: oo_first_master
-  tasks:
-  - name: Run the Management Integration Tasks
-    include_role:
-      name: openshift_management
-      tasks_from: add_container_provider
diff --git a/playbooks/common/openshift-management/config.yml b/playbooks/common/openshift-management/config.yml
deleted file mode 100644
index 3f1cdf713..000000000
--- a/playbooks/common/openshift-management/config.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- name: Management Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Management install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_management:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Setup CFME
-  hosts: oo_first_master
-  pre_tasks:
-  - name: Create a temporary place to evaluate the PV templates
-    command: mktemp -d /tmp/openshift-ansible-XXXXXXX
-    register: r_openshift_management_mktemp
-    changed_when: false
-
-  tasks:
-  - name: Run the CFME Setup Role
-    include_role:
-      name: openshift_management
-    vars:
-      template_dir: "{{ hostvars[groups.masters.0].r_openshift_management_mktemp.stdout }}"
-
-- name: Management Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Management install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_management:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-management/filter_plugins b/playbooks/common/openshift-management/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/common/openshift-management/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-management/library b/playbooks/common/openshift-management/library
deleted file mode 120000
index ba40d2f56..000000000
--- a/playbooks/common/openshift-management/library
+++ /dev/null
@@ -1 +0,0 @@
-../../../library
\ No newline at end of file
diff --git a/playbooks/common/openshift-management/roles b/playbooks/common/openshift-management/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/common/openshift-management/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
\ No newline at end of file
diff --git a/playbooks/common/openshift-management/uninstall.yml b/playbooks/common/openshift-management/uninstall.yml
deleted file mode 100644
index 9f35cc276..000000000
--- a/playbooks/common/openshift-management/uninstall.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Uninstall CFME
-  hosts: masters[0]
-  tasks:
-  - name: Run the CFME Uninstall Role Tasks
-    include_role:
-      name: openshift_management
-      tasks_from: uninstall