From c8ec88b661133e05095d5b8310d15af36bb35f34 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Thu, 11 May 2017 15:13:10 +0200 Subject: Verify memory and disk requirements before install --- playbooks/byo/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'playbooks') diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml index 7d03914a2..050b271ca 100644 --- a/playbooks/byo/config.yml +++ b/playbooks/byo/config.yml @@ -1,2 +1,14 @@ --- +- name: Verify Requirements + # REVIEW: what's the proper group to use: OSEv3, g_all_hosts or something else? + hosts: OSEv3 + roles: + - openshift_health_checker + post_tasks: + - action: openshift_health_check + args: + checks: + - disk_availability + - memory_availability + - include: openshift-cluster/config.yml -- cgit v1.2.1 From 1d5d13308bd79051b0bf3311240ef0e6cb286392 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Tue, 16 May 2017 12:24:46 -0400 Subject: health checks: configure failure output in playbooks Customized the error summary to depend on the intent of the playbook run. Ensured output makes sense when failures are unrelated to running checks. --- playbooks/byo/config.yml | 12 ------------ playbooks/byo/openshift-cluster/config.yml | 13 +++++++++++++ playbooks/common/openshift-checks/health.yml | 11 ++++++----- playbooks/common/openshift-checks/pre-install.yml | 11 ++++++----- 4 files changed, 25 insertions(+), 22 deletions(-) (limited to 'playbooks') diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml index 050b271ca..7d03914a2 100644 --- a/playbooks/byo/config.yml +++ b/playbooks/byo/config.yml @@ -1,14 +1,2 @@ --- -- name: Verify Requirements - # REVIEW: what's the proper group to use: OSEv3, g_all_hosts or something else? - hosts: OSEv3 - roles: - - openshift_health_checker - post_tasks: - - action: openshift_health_check - args: - checks: - - disk_availability - - memory_availability - - include: openshift-cluster/config.yml 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'] -- cgit v1.2.1