Merge pull request #6372 from mtnbikenc/include-to-include_tasks

Automatic merge from submit-queue.

Include Deprecation: Convert to include_tasks

For all roles/
* Converts to include_tasks: for dynamic includes
* Converts to import_tasks: for static includes

Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation

8 files changed, 21 insertions, 21 deletions

diff --git a/roles/openshift_aws/tasks/build_node_group.yml b/roles/openshift_aws/tasks/build_node_group.yml
index 7e8e9b679..2c1e88cfb 100644
--- a/roles/openshift_aws/tasks/build_node_group.yml
+++ b/roles/openshift_aws/tasks/build_node_group.yml
@@ -28,10 +28,10 @@
     l_epoch_time: "{{ ansible_date_time.epoch }}"
 
 - when: openshift_aws_create_iam_role
-  include: iam_role.yml
+  include_tasks: iam_role.yml
 
 - when: openshift_aws_create_launch_config
-  include: launch_config.yml
+  include_tasks: launch_config.yml
 
 - when: openshift_aws_create_scale_group
-  include: scale_group.yml
+  include_tasks: scale_group.yml
diff --git a/roles/openshift_aws/tasks/launch_config.yml b/roles/openshift_aws/tasks/launch_config.yml
index 0dbeba5a0..fed80b7eb 100644
--- a/roles/openshift_aws/tasks/launch_config.yml
+++ b/roles/openshift_aws/tasks/launch_config.yml
@@ -9,7 +9,7 @@
   when:
   - openshift_deployment_type is undefined
 
-- include: launch_config_create.yml
+- include_tasks: launch_config_create.yml
   with_dict: "{{ l_nodes_to_build }}"
   loop_control:
     loop_var: launch_config_item
diff --git a/roles/openshift_aws/tasks/provision.yml b/roles/openshift_aws/tasks/provision.yml
index 91538ed5c..06f649343 100644
--- a/roles/openshift_aws/tasks/provision.yml
+++ b/roles/openshift_aws/tasks/provision.yml
@@ -1,16 +1,16 @@
 ---
 - when: openshift_aws_create_iam_cert | bool
   name: create the iam_cert for elb certificate
-  include: iam_cert.yml
+  include_tasks: iam_cert.yml
 
 - when: openshift_aws_create_s3 | bool
   name: create s3 bucket for registry
-  include: s3.yml
+  include_tasks: s3.yml
 
-- include: vpc_and_subnet_id.yml
+- include_tasks: vpc_and_subnet_id.yml
 
 - name: create elbs
-  include: elb.yml
+  include_tasks: elb.yml
   with_dict: "{{ openshift_aws_elb_dict }}"
   vars:
     l_elb_security_groups: "{{ openshift_aws_elb_security_groups }}"
@@ -19,7 +19,7 @@
     loop_var: l_elb_dict_item
 
 - name: include scale group creation for master
-  include: build_node_group.yml
+  include_tasks: build_node_group.yml
   vars:
     l_nodes_to_build: "{{ openshift_aws_master_group_config }}"
     l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups }}"
diff --git a/roles/openshift_aws/tasks/provision_instance.yml b/roles/openshift_aws/tasks/provision_instance.yml
index 3349acb7a..8cc75cd0c 100644
--- a/roles/openshift_aws/tasks/provision_instance.yml
+++ b/roles/openshift_aws/tasks/provision_instance.yml
@@ -3,7 +3,7 @@
   set_fact:
     openshift_node_bootstrap: True
 
-- include: vpc_and_subnet_id.yml
+- include_tasks: vpc_and_subnet_id.yml
 
 - name: create instance for ami creation
   ec2:
diff --git a/roles/openshift_aws/tasks/provision_nodes.yml b/roles/openshift_aws/tasks/provision_nodes.yml
index 3e84666a2..041ed0791 100644
--- a/roles/openshift_aws/tasks/provision_nodes.yml
+++ b/roles/openshift_aws/tasks/provision_nodes.yml
@@ -27,17 +27,17 @@
   set_fact:
     openshift_aws_launch_config_bootstrap_token: "{{ bootstrap['content'] | b64decode }}"
 
-- include: vpc_and_subnet_id.yml
+- include_tasks: vpc_and_subnet_id.yml
 
 - name: include build compute and infra node groups
-  include: build_node_group.yml
+  include_tasks: build_node_group.yml
   vars:
     l_nodes_to_build: "{{ openshift_aws_node_group_config }}"
     l_launch_config_security_groups: "{{ openshift_aws_launch_config_security_groups }}"
     l_aws_ami_map: "{{ openshift_aws_ami_map }}"
 
 - name: include build node group for extra nodes
-  include: build_node_group.yml
+  include_tasks: build_node_group.yml
   when: openshift_aws_node_group_config_extra is defined
   vars:
     l_nodes_to_build: "{{ openshift_aws_node_group_config_extra | default({}) }}"
@@ -47,4 +47,4 @@
 # instances aren't scaling fast enough here, we need to wait for them
 - when: openshift_aws_wait_for_ssh | bool
   name: wait for our new nodes to come up
-  include: wait_for_groups.yml
+  include_tasks: wait_for_groups.yml
diff --git a/roles/openshift_aws/tasks/seal_ami.yml b/roles/openshift_aws/tasks/seal_ami.yml
index 0cb749dcc..7a3d0fb68 100644
--- a/roles/openshift_aws/tasks/seal_ami.yml
+++ b/roles/openshift_aws/tasks/seal_ami.yml
@@ -31,7 +31,7 @@
         source-ami: "{{ amioutput.image_id }}"
 
   - name: copy the ami for encrypted disks
-    include: ami_copy.yml
+    include_tasks: ami_copy.yml
     vars:
       openshift_aws_ami_copy_name: "{{ openshift_aws_ami_name }}-encrypted"
       openshift_aws_ami_copy_src_ami: "{{ amioutput.image_id }}"
diff --git a/roles/openshift_aws/tasks/security_group.yml b/roles/openshift_aws/tasks/security_group.yml
index 5cc7ae537..43834079e 100644
--- a/roles/openshift_aws/tasks/security_group.yml
+++ b/roles/openshift_aws/tasks/security_group.yml
@@ -6,11 +6,11 @@
       "tag:Name": "{{ openshift_aws_clusterid }}"
   register: vpcout
 
-- include: security_group_create.yml
+- include_tasks: security_group_create.yml
   vars:
     l_security_groups: "{{ openshift_aws_node_security_groups }}"
 
-- include: security_group_create.yml
+- include_tasks: security_group_create.yml
   when: openshift_aws_node_security_groups_extra is defined
   vars:
     l_security_groups: "{{ openshift_aws_node_security_groups_extra | default({}) }}"
diff --git a/roles/openshift_aws/tasks/upgrade_node_group.yml b/roles/openshift_aws/tasks/upgrade_node_group.yml
index d7851d887..c3f86f523 100644
--- a/roles/openshift_aws/tasks/upgrade_node_group.yml
+++ b/roles/openshift_aws/tasks/upgrade_node_group.yml
@@ -4,13 +4,13 @@
   when:
   - openshift_aws_current_version == openshift_aws_new_version
 
-- include: provision_nodes.yml
+- include_tasks: provision_nodes.yml
 
-- include: accept_nodes.yml
+- include_tasks: accept_nodes.yml
 
-- include: setup_scale_group_facts.yml
+- include_tasks: setup_scale_group_facts.yml
 
-- include: setup_master_group.yml
+- include_tasks: setup_master_group.yml
   vars:
     # we do not set etcd here as its limited to 1 or 3
     openshift_aws_masters_groups: masters,nodes