summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-25 15:16:32 -0400
committerGitHub <noreply@github.com>2017-05-25 15:16:32 -0400
commite8c8ed5404a4c0484a934f7f72a31532861f0d04 (patch)
tree3f27059d398c9ce074215c9651e7075593cf6541 /playbooks/common
parenta353d4daf48f37eb95affcff0cf318d90c055e7a (diff)
parentda04b572777f43fc7a595e0960b66442c101cfce (diff)
downloadopenshift-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/common')
-rw-r--r--playbooks/common/openshift-checks/health.yml11
-rw-r--r--playbooks/common/openshift-checks/pre-install.yml11
2 files changed, 12 insertions, 10 deletions
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']