diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-06-22 12:15:58 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-06-22 12:58:54 -0400 |
| commit | b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed (patch) | |
| tree | 878621445e243e6b119f3a13e58d676c9ee9f422 | |
| parent | 34c0124658d029112b938f92616149655765b5de (diff) | |
| download | openshift-b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed.tar.gz openshift-b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed.tar.bz2 openshift-b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed.tar.xz openshift-b79b9ab96b5ccd15dfeab6cb39ee4f22819df8ed.zip | |
Moving checks down after required initialization happens.
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 17 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 19 |
2 files changed, 19 insertions, 17 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 9c5948552..acf5469bf 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -3,23 +3,6 @@ tags: - always -- name: Verify Requirements - hosts: OSEv3 - 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: ../../common/openshift-cluster/std_include.yml tags: - always 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 |