summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-21 16:59:31 -0500
committerGitHub <noreply@github.com>2017-11-21 16:59:31 -0500
commitc007db1a6520b084edc7154fae863d67c230fe4b (patch)
treea6a0c625ab4ad54030d3a1eecf92e6489faab7fe /playbooks
parent8255f668ebac12171098f5ba6cbb74370ec3141c (diff)
parenta4c533e2a567562248768b2bc4998d1a36810894 (diff)
downloadopenshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.gz
openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.bz2
openshift-c007db1a6520b084edc7154fae863d67c230fe4b.tar.xz
openshift-c007db1a6520b084edc7154fae863d67c230fe4b.zip
Merge pull request #6144 from mtnbikenc/init-include-deprecation
Include Deprecation - Init Playbook Paths
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/init/facts.yml3
-rw-r--r--playbooks/init/main.yml12
2 files changed, 7 insertions, 8 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml
index 2523afbf1..676a59396 100644
--- a/playbooks/init/facts.yml
+++ b/playbooks/init/facts.yml
@@ -8,9 +8,8 @@
hosts: oo_all_hosts
tasks:
- name: load openshift_facts module
- include_role:
+ import_role:
name: openshift_facts
- static: yes
# TODO: Should this role be refactored into health_checks??
- name: Run openshift_sanitize_inventory to set variables
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml
index 87ffeafc7..1d4f41ffc 100644
--- a/playbooks/init/main.yml
+++ b/playbooks/init/main.yml
@@ -13,17 +13,17 @@
status: "In Progress"
start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-- include: evaluate_groups.yml
+- import_playbook: evaluate_groups.yml
-- include: facts.yml
+- import_playbook: facts.yml
-- include: sanity_checks.yml
+- import_playbook: sanity_checks.yml
-- include: validate_hostnames.yml
+- import_playbook: validate_hostnames.yml
-- include: repos.yml
+- import_playbook: repos.yml
-- include: version.yml
+- import_playbook: version.yml
- name: Initialization Checkpoint End
hosts: all