Refactor openshift-management entry point

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
 

playbooks/byo/openshift-management/uninstall.yml

@@ -1,6 +1,4 @@
 ---
 # - include: ../openshift-cluster/initialize_groups.yml
-#   tags:
-#     - always
 
 - include: ../../common/openshift-management/uninstall.yml

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

playbooks/common/openshift-cluster/openshift_management.yml

@@ -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

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

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'
             },
         }