diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-25 17:51:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 17:51:34 -0400 |
| commit | dbd43ea7b43ae197789837cbc4ab99639d63e9e0 (patch) | |
| tree | e13826bb2b88332c62a483ae76cbf3d716bdf884 | |
| parent | cc477558889b4a9e2595418c676a03e98cbfe20e (diff) | |
| parent | df8b79bffe706d39490f39a32d6dce8549a0c2d0 (diff) | |
| download | openshift-dbd43ea7b43ae197789837cbc4ab99639d63e9e0.tar.gz openshift-dbd43ea7b43ae197789837cbc4ab99639d63e9e0.tar.bz2 openshift-dbd43ea7b43ae197789837cbc4ab99639d63e9e0.tar.xz openshift-dbd43ea7b43ae197789837cbc4ab99639d63e9e0.zip | |
Merge pull request #5136 from mtnbikenc/std-openshift-checks
Merged by openshift-bot
| -rw-r--r-- | playbooks/byo/openshift-checks/health.yml | 3 | ||||
| -rw-r--r-- | playbooks/byo/openshift-checks/pre-install.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/health.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-checks/pre-install.yml | 8 |
4 files changed, 9 insertions, 11 deletions
diff --git a/playbooks/byo/openshift-checks/health.yml b/playbooks/byo/openshift-checks/health.yml index dfc1a7db0..96a71e4dc 100644 --- a/playbooks/byo/openshift-checks/health.yml +++ b/playbooks/byo/openshift-checks/health.yml @@ -1,3 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml + +- include: ../../common/openshift-cluster/std_include.yml + - include: ../../common/openshift-checks/health.yml diff --git a/playbooks/byo/openshift-checks/pre-install.yml b/playbooks/byo/openshift-checks/pre-install.yml index 5e8c3ab9b..dd93df0bb 100644 --- a/playbooks/byo/openshift-checks/pre-install.yml +++ b/playbooks/byo/openshift-checks/pre-install.yml @@ -1,3 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml + +- include: ../../common/openshift-cluster/std_include.yml + - include: ../../common/openshift-checks/pre-install.yml diff --git a/playbooks/common/openshift-checks/health.yml b/playbooks/common/openshift-checks/health.yml index ff5b5af67..21ea785ef 100644 --- a/playbooks/common/openshift-checks/health.yml +++ b/playbooks/common/openshift-checks/health.yml @@ -1,10 +1,6 @@ --- -- include: ../openshift-cluster/std_include.yml - tags: - - always - - name: Run OpenShift health checks - hosts: OSEv3 + hosts: oo_all_hosts roles: - openshift_health_checker vars: diff --git a/playbooks/common/openshift-checks/pre-install.yml b/playbooks/common/openshift-checks/pre-install.yml index 861229f21..88e6f9120 100644 --- a/playbooks/common/openshift-checks/pre-install.yml +++ b/playbooks/common/openshift-checks/pre-install.yml @@ -1,10 +1,6 @@ --- -- include: ../openshift-cluster/std_include.yml - tags: - - always - -- hosts: OSEv3 - name: run OpenShift pre-install checks +- name: run OpenShift pre-install checks + hosts: oo_all_hosts roles: - openshift_health_checker vars: |