summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-06-23 14:25:39 -0400
committerSteve Milner <smilner@redhat.com>2017-06-23 16:55:34 -0400
commit4c1adbb3312b6e3c616c587985da26e9671058d1 (patch)
tree49de6bb2614abba8846183e0864ddb2de462a80e /playbooks/common
parentb79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed (diff)
downloadopenshift-4c1adbb3312b6e3c616c587985da26e9671058d1.tar.gz
openshift-4c1adbb3312b6e3c616c587985da26e9671058d1.tar.bz2
openshift-4c1adbb3312b6e3c616c587985da26e9671058d1.tar.xz
openshift-4c1adbb3312b6e3c616c587985da26e9671058d1.zip
openshift_checks: eval groups before including role
openshift_health_checker requires openshift_version, and that has been updated to require group evaluation. Update check playbooks and integration tests to do group eval.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-checks/health.yml5
-rw-r--r--playbooks/common/openshift-checks/pre-install.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml
index 1bee460e8..c7766ff04 100644
--- a/playbooks/common/openshift-checks/health.yml
+++ b/playbooks/common/openshift-checks/health.yml
@@ -1,4 +1,9 @@
---
+# openshift_health_checker depends on openshift_version which now requires group eval.
+- include: ../openshift-cluster/evaluate_groups.yml
+ tags:
+ - always
+
- name: Run OpenShift health checks
hosts: OSEv3
roles:
diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml
index e01c6f38d..7ca9f7e8b 100644
--- a/playbooks/common/openshift-checks/pre-install.yml
+++ b/playbooks/common/openshift-checks/pre-install.yml
@@ -1,4 +1,9 @@
---
+# openshift_health_checker depends on openshift_version which now requires group eval.
+- include: ../openshift-cluster/evaluate_groups.yml
+ tags:
+ - always
+
- hosts: OSEv3
name: run OpenShift pre-install checks
roles: