diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-06-23 14:25:39 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-06-23 16:55:34 -0400 |
| commit | 4c1adbb3312b6e3c616c587985da26e9671058d1 (patch) | |
| tree | 49de6bb2614abba8846183e0864ddb2de462a80e | |
| parent | b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed (diff) | |
| download | openshift-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.
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 5 | ||||
| -rw-r--r-- | test/integration/openshift_health_checker/setup_container.yml | 3 |
3 files changed, 13 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: diff --git a/test/integration/openshift_health_checker/setup_container.yml b/test/integration/openshift_health_checker/setup_container.yml index 8793d954e..33e94cf1f 100644 --- a/test/integration/openshift_health_checker/setup_container.yml +++ b/test/integration/openshift_health_checker/setup_container.yml @@ -43,3 +43,6 @@ delegate_facts: True delegate_to: "{{ container_name }}" with_dict: "{{ l_host_vars | default({}) }}" + +- include: ../../../playbooks/byo/openshift-cluster/initialize_groups.yml +- include: ../../../playbooks/common/openshift-cluster/evaluate_groups.yml |