diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-25 15:16:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 15:16:32 -0400 |
| commit | e8c8ed5404a4c0484a934f7f72a31532861f0d04 (patch) | |
| tree | 3f27059d398c9ce074215c9651e7075593cf6541 /playbooks | |
| parent | a353d4daf48f37eb95affcff0cf318d90c055e7a (diff) | |
| parent | da04b572777f43fc7a595e0960b66442c101cfce (diff) | |
| download | openshift-e8c8ed5404a4c0484a934f7f72a31532861f0d04.tar.gz openshift-e8c8ed5404a4c0484a934f7f72a31532861f0d04.tar.bz2 openshift-e8c8ed5404a4c0484a934f7f72a31532861f0d04.tar.xz openshift-e8c8ed5404a4c0484a934f7f72a31532861f0d04.zip | |
Merge pull request #4161 from rhcarvalho/integrate-checks-with-install
Verify memory and disk requirements before install
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 13 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 11 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 11 |
3 files changed, 25 insertions, 10 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index acf5469bf..fd4a9eb26 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -3,6 +3,19 @@ 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 + - 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 fc0f523d5..1bee460e8 100644 --- a/playbooks/common/openshift-checks/health.yml +++ b/playbooks/common/openshift-checks/health.yml @@ -2,9 +2,10 @@ - name: Run OpenShift health checks hosts: OSEv3 roles: - - openshift_health_checker + - openshift_health_checker + vars: + - r_openshift_health_checker_playbook_context: "health" post_tasks: - - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 - args: - checks: - - '@health' + - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 + args: + checks: ['@health'] diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml index c8ffc3d91..e01c6f38d 100644 --- a/playbooks/common/openshift-checks/pre-install.yml +++ b/playbooks/common/openshift-checks/pre-install.yml @@ -2,9 +2,10 @@ - hosts: OSEv3 name: run OpenShift pre-install checks roles: - - openshift_health_checker + - openshift_health_checker + vars: + - r_openshift_health_checker_playbook_context: "pre-install" post_tasks: - - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 - args: - checks: - - '@preflight' + - action: openshift_health_check # https://github.com/ansible/ansible/issues/20513 + args: + checks: ['@preflight'] |