瀏覽代碼

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.
Luke Meyer 8 年之前
父節點
當前提交
4c1adbb331

+ 5 - 0
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:

+ 5 - 0
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:

+ 3 - 0
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