diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-28 08:32:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 08:32:57 -0400 |
| commit | f0abc3268bcc0f33cd6539d870c6231d4028082d (patch) | |
| tree | bc237f6f7a1e98027938b10b0f2b2d4b92764bff /playbooks/common | |
| parent | bdd97b01cf743b81b66ba252883ecf26fd5d1aef (diff) | |
| parent | d6d5fe2954942a6706f5ae0255d94435ceade50b (diff) | |
| download | openshift-f0abc3268bcc0f33cd6539d870c6231d4028082d.tar.gz openshift-f0abc3268bcc0f33cd6539d870c6231d4028082d.tar.bz2 openshift-f0abc3268bcc0f33cd6539d870c6231d4028082d.tar.xz openshift-f0abc3268bcc0f33cd6539d870c6231d4028082d.zip | |
Merge pull request #4899 from rhcarvalho/misc-cleanup-normalize-input
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml index c7766ff04..7e83b4aa6 100644 --- a/playbooks/common/openshift-checks/health.yml +++ b/playbooks/common/openshift-checks/health.yml @@ -1,16 +1,13 @@ --- -# 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: - openshift_health_checker vars: - - r_openshift_health_checker_playbook_context: "health" + - 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..afd4f95e0 100644 --- a/playbooks/common/openshift-checks/pre-install.yml +++ b/playbooks/common/openshift-checks/pre-install.yml @@ -1,16 +1,13 @@ --- -# 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: - openshift_health_checker vars: - - r_openshift_health_checker_playbook_context: "pre-install" + - 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'] diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 7224ae712..31c4b04af 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -6,7 +6,7 @@ roles: - openshift_health_checker vars: - - r_openshift_health_checker_playbook_context: "install" + - r_openshift_health_checker_playbook_context: install post_tasks: - action: openshift_health_check args: |