From b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Thu, 22 Jun 2017 12:15:58 -0400 Subject: Moving checks down after required initialization happens. --- playbooks/common/openshift-cluster/config.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 1482b3a3f..234f9e15c 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,4 +1,23 @@ --- +# TODO: refactor this into its own include +# and pass a variable for ctx +- name: Verify Requirements + hosts: oo_all_hosts + roles: + - openshift_health_checker + vars: + - r_openshift_health_checker_playbook_context: "install" + post_tasks: + - action: openshift_health_check + args: + checks: + - disk_availability + - memory_availability + - package_availability + - package_version + - docker_image_availability + - docker_storage + - include: initialize_oo_option_facts.yml tags: - always -- cgit v1.2.3 From 4c1adbb3312b6e3c616c587985da26e9671058d1 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 23 Jun 2017 14:25:39 -0400 Subject: 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. --- playbooks/common/openshift-checks/health.yml | 5 +++++ playbooks/common/openshift-checks/pre-install.yml | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'playbooks/common') 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: -- cgit v1.2.3