Merge pull request #6147 from mtnbikenc/consolidate-openshift-checks

Automatic merge from submit-queue.

Playbook Consolidation - openshift-checks

- Create playbooks/openshift-checks directory
- Move everything from playbooks/byo/openshift-checks to playbooks/openshift-checks
- Move everything from playbooks/common/openshift-checks to playbooks/openshift-checks/private
- Fix all include path references throughout playbooks/

Trello: https://trello.com/c/2Rx1uvjz/547-2-playbook-consolidation-openshift-checks

6 files changed, 1 insertions, 92 deletions

diff --git a/playbooks/common/openshift-checks/adhoc.yml b/playbooks/common/openshift-checks/adhoc.yml
deleted file mode 100644
index d0deaeb65..000000000
--- a/playbooks/common/openshift-checks/adhoc.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- 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 (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
deleted file mode 100644
index d0921b9d3..000000000
--- a/playbooks/common/openshift-checks/health.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: health
-  post_tasks:
-  - 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
deleted file mode 100644
index 93cf6c359..000000000
--- a/playbooks/common/openshift-checks/install.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-- name: Health Check Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set Health Check 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_health:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- 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: all
-  gather_facts: false
-  tasks:
-  - name: Set Health Check 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_health:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml
deleted file mode 100644
index 32449d4e4..000000000
--- a/playbooks/common/openshift-checks/pre-install.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: OpenShift Health Checks
-  hosts: oo_all_hosts
-
-  roles:
-  - openshift_health_checker
-  vars:
-  - r_openshift_health_checker_playbook_context: pre-install
-  post_tasks:
-  - name: Run health checks (@preflight)
-    action: openshift_health_check
-    args:
-      checks: ['@preflight']
diff --git a/playbooks/common/openshift-checks/roles b/playbooks/common/openshift-checks/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/common/openshift-checks/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles
\ No newline at end of file
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 3b4d6f9a6..588291878 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -1,5 +1,5 @@
 ---
-- include: ../openshift-checks/install.yml
+- include: ../../openshift-checks/private/install.yml
 
 - include: ../openshift-etcd/config.yml