summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-05-16 12:24:46 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-05-23 14:39:48 -0400
commit1d5d13308bd79051b0bf3311240ef0e6cb286392 (patch)
tree474d5ea04967bf7d746d43f7f7bc6ac65bfe24dd /playbooks/common
parent95df850e7df5b0afb2d7e759582ada6c6fab0df6 (diff)
downloadopenshift-1d5d13308bd79051b0bf3311240ef0e6cb286392.tar.gz
openshift-1d5d13308bd79051b0bf3311240ef0e6cb286392.tar.bz2
openshift-1d5d13308bd79051b0bf3311240ef0e6cb286392.tar.xz
openshift-1d5d13308bd79051b0bf3311240ef0e6cb286392.zip
health checks: configure failure output in playbooks
Customized the error summary to depend on the intent of the playbook run. Ensured output makes sense when failures are unrelated to running checks.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-checks/health.yml11
-rw-r--r--playbooks/common/openshift-checks/pre-install.yml11
2 files changed, 12 insertions, 10 deletions
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml
index fc0f523d5..1bee460e8 100644
--- a/playbooks/common/openshift-checks/health.yml
+++ b/playbooks/common/openshift-checks/health.yml
@@ -2,9 +2,10 @@
- name: Run OpenShift health checks
hosts: OSEv3
roles:
- - openshift_health_checker
+ - openshift_health_checker
+ vars:
+ - r_openshift_health_checker_playbook_context: "health"
post_tasks:
- - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513
- args:
- checks:
- - '@health'
+ - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513
+ args:
+ checks: ['@health']
diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml
index c8ffc3d91..e01c6f38d 100644
--- a/playbooks/common/openshift-checks/pre-install.yml
+++ b/playbooks/common/openshift-checks/pre-install.yml
@@ -2,9 +2,10 @@
- hosts: OSEv3
name: run OpenShift pre-install checks
roles:
- - openshift_health_checker
+ - openshift_health_checker
+ vars:
+ - r_openshift_health_checker_playbook_context: "pre-install"
post_tasks:
- - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513
- args:
- checks:
- - '@preflight'
+ - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513
+ args:
+ checks: ['@preflight']