diff options
| author | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-07-25 09:51:19 +0200 |
|---|---|---|
| committer | Rodolfo Carvalho <rhcarvalho@gmail.com> | 2017-07-27 16:30:18 +0200 |
| commit | e61819d89f52beddfa244e825931e068872f44f2 (patch) | |
| tree | 67010b442c8f89ac52782ca610ce75552beec5e0 | |
| parent | 6a9fd57be17d03818eb1f72cc9d62505690eec14 (diff) | |
| download | openshift-e61819d89f52beddfa244e825931e068872f44f2.tar.gz openshift-e61819d89f52beddfa244e825931e068872f44f2.tar.bz2 openshift-e61819d89f52beddfa244e825931e068872f44f2.tar.xz openshift-e61819d89f52beddfa244e825931e068872f44f2.zip | |
Clean up openshift-checks playbooks
- The referenced issue was closed, seems like a wontfix. Just use the
old syntax and make no noise about it.
- Remove inconsistent use of tags: if tags are passed in the command
line, there is no point in evaluating groups if the checks won't be run
anyway.
- Remove temporal comment, easy to get out of sync.
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml index c7766ff04..713d85eeb 100644 --- a/playbooks/common/openshift-checks/health.yml +++ b/playbooks/common/openshift-checks/health.yml @@ -1,8 +1,5 @@ --- -# 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 @@ -11,6 +8,6 @@ vars: - r_openshift_health_checker_playbook_context: "health" post_tasks: - - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 + - action: openshift_health_check args: checks: ['@health'] diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml index 7ca9f7e8b..edc0162b9 100644 --- a/playbooks/common/openshift-checks/pre-install.yml +++ b/playbooks/common/openshift-checks/pre-install.yml @@ -1,8 +1,5 @@ --- -# 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 @@ -11,6 +8,6 @@ vars: - r_openshift_health_checker_playbook_context: "pre-install" post_tasks: - - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 + - action: openshift_health_check args: checks: ['@preflight'] |