diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-26 11:57:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 11:57:17 -0400 |
| commit | 7b0acaff56fe08e4d302a86ed4b00db6739f16a9 (patch) | |
| tree | 72e9ff341055201e504f6e12ed71464ec7df7fab /playbooks | |
| parent | 7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296 (diff) | |
| parent | bc9f9304bd79017281acb42b4e6283004fd6e42d (diff) | |
| download | openshift-7b0acaff56fe08e4d302a86ed4b00db6739f16a9.tar.gz openshift-7b0acaff56fe08e4d302a86ed4b00db6739f16a9.tar.bz2 openshift-7b0acaff56fe08e4d302a86ed4b00db6739f16a9.tar.xz openshift-7b0acaff56fe08e4d302a86ed4b00db6739f16a9.zip | |
Merge pull request #4495 from ashcrow/skip-nfs-on-requirements-check
Skip nfs and lb groups on openshift_version
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 17 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 19 |
4 files changed, 29 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-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/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 2a75b8dc3..7224ae712 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 |