summaryrefslogtreecommitdiffstats
path: root/roles/openshift_openstack
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-12-06 09:48:59 -0500
committerRussell Teague <rteague@redhat.com>2017-12-06 09:48:59 -0500
commit50751e3c5e8e8dca97cd27d4c93944515666c8b5 (patch)
tree2ae261e69fd2d099c1be3d5790762c39e2e809b1 /roles/openshift_openstack
parent9099dc40ea3f75a2d9d87ba8f30400764508170b (diff)
downloadopenshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.gz
openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.bz2
openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.tar.xz
openshift-50751e3c5e8e8dca97cd27d4c93944515666c8b5.zip
Include Deprecation: Convert to include_tasks
Diffstat (limited to 'roles/openshift_openstack')
-rw-r--r--roles/openshift_openstack/tasks/check-prerequisites.yml4
-rw-r--r--roles/openshift_openstack/tasks/node-configuration.yml4
-rw-r--r--roles/openshift_openstack/tasks/provision.yml4
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_openstack/tasks/check-prerequisites.yml b/roles/openshift_openstack/tasks/check-prerequisites.yml
index 0ef60459f..30996cc47 100644
--- a/roles/openshift_openstack/tasks/check-prerequisites.yml
+++ b/roles/openshift_openstack/tasks/check-prerequisites.yml
@@ -87,7 +87,7 @@
msg: "Keypair {{ openshift_openstack_keypair_name }} is not available"
# Check that custom images are available
-- include: custom_image_check.yaml
+- include_tasks: custom_image_check.yaml
with_items:
- "{{ openshift_openstack_master_image }}"
- "{{ openshift_openstack_infra_image }}"
@@ -96,7 +96,7 @@
- "{{ openshift_openstack_etcd_image }}"
# Check that custom flavors are available
-- include: custom_flavor_check.yaml
+- include_tasks: custom_flavor_check.yaml
with_items:
- "{{ openshift_openstack_master_flavor }}"
- "{{ openshift_openstack_infra_flavor }}"
diff --git a/roles/openshift_openstack/tasks/node-configuration.yml b/roles/openshift_openstack/tasks/node-configuration.yml
index 53e3bb28c..59df2e396 100644
--- a/roles/openshift_openstack/tasks/node-configuration.yml
+++ b/roles/openshift_openstack/tasks/node-configuration.yml
@@ -4,6 +4,6 @@
msg: "SELinux is required for OpenShift and has been detected as '{{ ansible_selinux.config_mode }}'"
when: ansible_selinux.config_mode != "enforcing"
-- include: container-storage-setup.yml
+- include_tasks: container-storage-setup.yml
-- include: node-network.yml
+- include_tasks: node-network.yml
diff --git a/roles/openshift_openstack/tasks/provision.yml b/roles/openshift_openstack/tasks/provision.yml
index dccbe334c..b774bd620 100644
--- a/roles/openshift_openstack/tasks/provision.yml
+++ b/roles/openshift_openstack/tasks/provision.yml
@@ -1,6 +1,6 @@
---
- name: Generate the templates
- include: generate-templates.yml
+ include_tasks: generate-templates.yml
when:
- openshift_openstack_stack_state == 'present'
@@ -17,7 +17,7 @@
meta: refresh_inventory
- name: CleanUp
- include: cleanup.yml
+ include_tasks: cleanup.yml
when:
- openshift_openstack_stack_state == 'present'