Refactor health check playbooks

- Standardize play/tasks naming
- Move install checks to separate playbook with checkpointing
- Correct 'docker_storage' tags

7 files changed, 65 insertions, 34 deletions

diff --git a/playbooks/common/openshift-checks/adhoc.yml b/playbooks/common/openshift-checks/adhoc.yml
index dfcef8435..d0deaeb65 100644
--- a/playbooks/common/openshift-checks/adhoc.yml
+++ b/playbooks/common/openshift-checks/adhoc.yml
@@ -1,12 +1,13 @@
 ---
-- name: OpenShift health checks
+- name: OpenShift Health Checks
   hosts: oo_all_hosts
+
   roles:
   - openshift_health_checker
   vars:
   - r_openshift_health_checker_playbook_context: adhoc
   post_tasks:
-  - name: Run health checks
+  - name: Run health checks (adhoc)
     action: openshift_health_check
     args:
       checks: '{{ openshift_checks | default([]) }}'
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml
index 21ea785ef..d0921b9d3 100644
--- a/playbooks/common/openshift-checks/health.yml
+++ b/playbooks/common/openshift-checks/health.yml
@@ -1,11 +1,13 @@
 ---
-- name: Run OpenShift health checks
+- name: OpenShift Health Checks
   hosts: oo_all_hosts
+
   roles:
   - openshift_health_checker
   vars:
   - r_openshift_health_checker_playbook_context: health
   post_tasks:
-  - action: openshift_health_check
+  - name: Run health checks (@health)
+    action: openshift_health_check
     args:
       checks: ['@health']
diff --git a/playbooks/common/openshift-checks/install.yml b/playbooks/common/openshift-checks/install.yml
new file mode 100644
index 000000000..6701a2e15
--- /dev/null
+++ b/playbooks/common/openshift-checks/install.yml
@@ -0,0 +1,47 @@
+---
+- name: Health Check Checkpoint Start
+  hosts: oo_all_hosts
+  gather_facts: false
+  tasks:
+  - name: Set Health Check 'In Progress'
+    set_stats:
+      data:
+        installer_phase_health: "In Progress"
+      aggregate: false
+
+- name: OpenShift Health Checks
+  hosts: oo_all_hosts
+  any_errors_fatal: true
+  roles:
+  - openshift_health_checker
+  vars:
+  - r_openshift_health_checker_playbook_context: install
+  post_tasks:
+  - name: Run health checks (install) - EL
+    when: ansible_distribution != "Fedora"
+    action: openshift_health_check
+    args:
+      checks:
+      - disk_availability
+      - memory_availability
+      - package_availability
+      - package_version
+      - docker_image_availability
+      - docker_storage
+
+  - name: Run health checks (install) - Fedora
+    when: ansible_distribution == "Fedora"
+    action: openshift_health_check
+    args:
+      checks:
+      - docker_image_availability
+
+- name: Health Check Checkpoint End
+  hosts: oo_all_hosts
+  gather_facts: false
+  tasks:
+  - name: Set Health Check 'Complete'
+    set_stats:
+      data:
+        installer_phase_health: "Complete"
+      aggregate: false
diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml
index 88e6f9120..32449d4e4 100644
--- a/playbooks/common/openshift-checks/pre-install.yml
+++ b/playbooks/common/openshift-checks/pre-install.yml
@@ -1,11 +1,13 @@
 ---
-- name: run OpenShift pre-install checks
+- name: OpenShift Health Checks
   hosts: oo_all_hosts
+
   roles:
   - openshift_health_checker
   vars:
   - r_openshift_health_checker_playbook_context: pre-install
   post_tasks:
-  - action: openshift_health_check
+  - name: Run health checks (@preflight)
+    action: openshift_health_check
     args:
       checks: ['@preflight']
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index dbe09dce2..3fbc6ef25 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -1,31 +1,5 @@
 ---
-# TODO: refactor this into its own include
-# and pass a variable for ctx
-- name: Verify Requirements
-  hosts: oo_all_hosts
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: install
-  post_tasks:
-
-  - name: Verify Requirements - EL
-    when: ansible_distribution != "Fedora"
-    action: openshift_health_check
-    args:
-      checks:
-      - disk_availability
-      - memory_availability
-      - package_availability
-      - package_version
-      - docker_image_availability
-      - docker_storage
-  - name: Verify Requirements - Fedora
-    when: ansible_distribution == "Fedora"
-    action: openshift_health_check
-    args:
-      checks:
-      - docker_image_availability
+- include: ../openshift-checks/install.yml
 
 - include: ../openshift-etcd/config.yml
 
diff --git a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
index ac369b882..07c58f9cd 100644
--- a/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
+++ b/roles/installer_checkpoint/callback_plugins/installer_checkpoint.py
@@ -70,6 +70,7 @@ class CallbackModule(CallbackBase):
         # Set the order of the installer phases
         installer_phases = [
             'installer_phase_initialize',
+            'installer_phase_health',
             'installer_phase_etcd',
             'installer_phase_nfs',
             'installer_phase_loadbalancer',
@@ -90,6 +91,10 @@ class CallbackModule(CallbackBase):
                 'title': 'Initialization',
                 'playbook': ''
             },
+            'installer_phase_health': {
+                'title': 'Health Check',
+                'playbook': 'playbooks/byo/openshift-checks/pre-install.yml'
+            },
             'installer_phase_etcd': {
                 'title': 'etcd Install',
                 'playbook': 'playbooks/byo/openshift-etcd/config.yml'
diff --git a/roles/openshift_health_checker/openshift_checks/docker_storage.py b/roles/openshift_health_checker/openshift_checks/docker_storage.py
index 0558ddf14..6808d8b2f 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_storage.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_storage.py
@@ -14,7 +14,7 @@ class DockerStorage(DockerHostMixin, OpenShiftCheck):
     """
 
     name = "docker_storage"
-    tags = ["pre-install", "health", "preflight"]
+    tags = ["health", "preflight"]
 
     dependencies = ["python-docker-py"]
     storage_drivers = ["devicemapper", "overlay", "overlay2"]