Merge pull request #5734 from mtnbikenc/refactor-mgmt-entry

Automatic merge from submit-queue.

Refactor openshift-management entry point

Moves checkpointing steps into path for both full cluster install and individual entry point playbook.

6 files changed, 22 insertions, 31 deletions

diff --git a/playbooks/byo/openshift-management/config.yml b/playbooks/byo/openshift-management/config.yml
index 33a555cc1..e8795ef85 100644
--- a/playbooks/byo/openshift-management/config.yml
+++ b/playbooks/byo/openshift-management/config.yml
@@ -1,7 +1,5 @@
 ---
 - include: ../openshift-cluster/initialize_groups.yml
-  tags:
-    - always
 
 - include: ../../common/openshift-cluster/evaluate_groups.yml
 
diff --git a/playbooks/byo/openshift-management/uninstall.yml b/playbooks/byo/openshift-management/uninstall.yml
index ebd6fb261..a1fb1cdc4 100644
--- a/playbooks/byo/openshift-management/uninstall.yml
+++ b/playbooks/byo/openshift-management/uninstall.yml
@@ -1,6 +1,4 @@
 ---
 # - include: ../openshift-cluster/initialize_groups.yml
-#   tags:
-#     - always
 
 - include: ../../common/openshift-management/uninstall.yml
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index dbe09dce2..395eb51f1 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -55,7 +55,7 @@
 - include: service_catalog.yml
   when: openshift_enable_service_catalog | default(false) | bool
 
-- include: openshift_management.yml
+- include: ../openshift-management/config.yml
   when: openshift_management_install_management | default(false) | bool
 
 - name: Print deprecated variable warning message if necessary
diff --git a/playbooks/common/openshift-cluster/openshift_management.yml b/playbooks/common/openshift-cluster/openshift_management.yml
deleted file mode 100644
index 6e582920b..000000000
--- a/playbooks/common/openshift-cluster/openshift_management.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Management Install Checkpoint Start
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  tasks:
-  - name: Set Management install 'In Progress'
-    set_stats:
-      data:
-        installer_phase_Management: "In Progress"
-      aggregate: false
-
-- name: Management
-  include: ../openshift-management/config.yml
-
-- name: Management Install Checkpoint End
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  tasks:
-  - name: Set Management install 'Complete'
-    set_stats:
-      data:
-        installer_phase_Management: "Complete"
-      aggregate: false
diff --git a/playbooks/common/openshift-management/config.yml b/playbooks/common/openshift-management/config.yml
index 0aaafe440..908679e81 100644
--- a/playbooks/common/openshift-management/config.yml
+++ b/playbooks/common/openshift-management/config.yml
@@ -1,4 +1,14 @@
 ---
+- name: Management Install Checkpoint Start
+  hosts: oo_all_hosts
+  gather_facts: false
+  tasks:
+  - name: Set Management install 'In Progress'
+    set_stats:
+      data:
+        installer_phase_management: "In Progress"
+      aggregate: false
+
 - name: Setup CFME
   hosts: oo_first_master
   pre_tasks:
@@ -13,3 +23,13 @@
       name: openshift_management
     vars:
       template_dir: "{{ hostvars[groups.masters.0].r_openshift_management_mktemp.stdout }}"
+
+- name: Management Install Checkpoint End
+  hosts: oo_all_hosts
+  gather_facts: false
+  tasks:
+  - name: Set Management install 'Complete'
+    set_stats:
+      data:
+        installer_phase_management: "Complete"
+      aggregate: false
diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
index ac369b882..25f9405af 100644
--- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
+++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
@@ -136,7 +136,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_management': {
                 'title': 'Management Install',
-                'playbook': 'playbooks/common/openshift-cluster/openshift_management.yml'
+                'playbook': 'playbooks/byo/openshift-management/config.yml'
             },
         }