diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-11-16 08:49:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 08:49:07 -0500 |
commit | 7dcc6292e2ca89fe22675491299cf5853860bed8 (patch) | |
tree | 956a8f8d2cac46f5529604c2201facea1611ea0d /playbooks/byo/openshift-checks | |
parent | 45532f4578f99243f14493aa42b4ffd7b0fb8265 (diff) | |
parent | e5f4823d6e4191367178f743ddd5e0885598e8cf (diff) | |
download | openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.gz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.bz2 openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.xz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.zip |
Merge pull request #6064 from mtnbikenc/consolidate-init
Playbook Consolidation - Initialization
Diffstat (limited to 'playbooks/byo/openshift-checks')
-rw-r--r-- | playbooks/byo/openshift-checks/adhoc.yml | 4 | ||||
-rw-r--r-- | playbooks/byo/openshift-checks/health.yml | 4 | ||||
-rw-r--r-- | playbooks/byo/openshift-checks/pre-install.yml | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/playbooks/byo/openshift-checks/adhoc.yml b/playbooks/byo/openshift-checks/adhoc.yml index 226bed732..4ee9e75f1 100644 --- a/playbooks/byo/openshift-checks/adhoc.yml +++ b/playbooks/byo/openshift-checks/adhoc.yml @@ -20,8 +20,6 @@ action: openshift_health_check when: openshift_checks is undefined or not openshift_checks -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-checks/adhoc.yml diff --git a/playbooks/byo/openshift-checks/health.yml b/playbooks/byo/openshift-checks/health.yml index 96a71e4dc..0034251e3 100644 --- a/playbooks/byo/openshift-checks/health.yml +++ b/playbooks/byo/openshift-checks/health.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.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 dd93df0bb..1d35f601b 100644 --- a/playbooks/byo/openshift-checks/pre-install.yml +++ b/playbooks/byo/openshift-checks/pre-install.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-checks/pre-install.yml |