From bb38413fcec7fb2640939782d57e494b40e3b41e Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Mon, 30 Jan 2017 18:29:06 +0100
Subject: Replace multi-role checks with action plugin

This approach should make it easier to add new checks without having to
write lots of YAML and doing things against Ansible (e.g.
ignore_errors).

A single action plugin determines what checks to run per each host,
including arguments to the check. A check is implemented as a class with
a run method, with the same signature as an action plugin and module,
and is normally backed by a regular Ansible module.

Each check is implemented as a separate Python file. This allows whoever
adds a new check to focus solely in a single Python module, and
potentially an Ansible module within library/ too.

All checks are automatically loaded, and only active checks that are
requested by the playbook get executed.
---
 playbooks/byo/openshift-preflight/check.yml | 41 +++++++++--------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'playbooks/byo/openshift-preflight')

diff --git a/playbooks/byo/openshift-preflight/check.yml b/playbooks/byo/openshift-preflight/check.yml
index 32673d01d..935531e02 100644
--- a/playbooks/byo/openshift-preflight/check.yml
+++ b/playbooks/byo/openshift-preflight/check.yml
@@ -1,31 +1,14 @@
 ---
 - hosts: OSEv3
-  roles:
-    - openshift_preflight/init
-
-- hosts: OSEv3
-  name: checks that apply to all hosts
-  gather_facts: no
-  ignore_errors: yes
-  roles:
-    - openshift_preflight/common
-
-- hosts: masters
-  name: checks that apply to masters
-  gather_facts: no
-  ignore_errors: yes
-  roles:
-    - openshift_preflight/masters
-
-- hosts: nodes
-  name: checks that apply to nodes
-  gather_facts: no
-  ignore_errors: yes
-  roles:
-    - openshift_preflight/nodes
-
-- hosts: OSEv3
-  name: verify check results
-  gather_facts: no
-  roles:
-    - openshift_preflight/verify_status
+  name: run OpenShift health checks
+  roles:
+    - openshift_health_checker
+  post_tasks:
+    # NOTE: we need to use the old "action: name" syntax until
+    # https://github.com/ansible/ansible/issues/20513 is fixed.
+    - action: openshift_health_check
+      args:
+        checks:
+          - package_availability
+          - package_update
+          - package_version
-- 
cgit v1.2.3


From c838e0f0b79b1471c47addf50c46fdb12281812c Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Tue, 31 Jan 2017 18:15:19 +0100
Subject: Introduce tag notation for checks

This allows us to refer to a group of checks using a single handle.
---
 playbooks/byo/openshift-preflight/check.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'playbooks/byo/openshift-preflight')

diff --git a/playbooks/byo/openshift-preflight/check.yml b/playbooks/byo/openshift-preflight/check.yml
index 935531e02..c5f05d0f0 100644
--- a/playbooks/byo/openshift-preflight/check.yml
+++ b/playbooks/byo/openshift-preflight/check.yml
@@ -9,6 +9,4 @@
     - action: openshift_health_check
       args:
         checks:
-          - package_availability
-          - package_update
-          - package_version
+          - '@preflight'
-- 
cgit v1.2.3