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

36 files changed, 82 insertions, 88 deletions

diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index 8dcfe60ef..48e33f0aa 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -139,8 +139,7 @@
     state: directory
 
 - name: setup firewall for CRI-O
-  include_tasks: crio_firewall.yml
-  static: yes
+  import_tasks: crio_firewall.yml
 
 - name: Configure the CNI network
   template:
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
diff --git a/roles/openshift_cluster_autoscaler/tasks/main.yml b/roles/openshift_cluster_autoscaler/tasks/main.yml
index 173dcf044..ca7dfb885 100644
--- a/roles/openshift_cluster_autoscaler/tasks/main.yml
+++ b/roles/openshift_cluster_autoscaler/tasks/main.yml
@@ -31,7 +31,7 @@
     type: role
     name: "{{ openshift_cluster_autoscaler_name }}"
 
-- include: aws.yml
+- include_tasks: aws.yml
   when: openshift_cluster_autoscaler_cloud_provider == 'aws'
 
 - name: create the policies
diff --git a/roles/openshift_hosted/tasks/registry.yml b/roles/openshift_hosted/tasks/registry.yml
index 4797fb788..de302c740 100644
--- a/roles/openshift_hosted/tasks/registry.yml
+++ b/roles/openshift_hosted/tasks/registry.yml
@@ -6,7 +6,7 @@
   check_mode: no
 
 - name: setup firewall
-  include: firewall.yml
+  import_tasks: firewall.yml
   vars:
     l_openshift_hosted_firewall_enabled: "{{ r_openshift_hosted_registry_firewall_enabled }}"
     l_openshift_hosted_use_firewalld: "{{ r_openshift_hosted_registry_use_firewalld }}"
@@ -94,14 +94,12 @@
     service_type: ClusterIP
     clusterip: '{{ openshift_hosted_registry_clusterip | default(omit) }}'
 
-- include: secure.yml
-  static: no
+- include_tasks: secure.yml
   run_once: true
   when:
   - not (openshift_docker_hosted_registry_insecure | default(False)) | bool
 
-- include: storage/object_storage.yml
-  static: no
+- include_tasks: storage/object_storage.yml
   when:
   - openshift_hosted_registry_storage_kind | default(none) == 'object'
 
@@ -116,7 +114,7 @@
   when:
   - openshift_hosted_registry_storage_kind | default(none) in ['nfs', 'openstack', 'glusterfs']
 
-- include: storage/glusterfs_endpoints.yml
+- include_tasks: storage/glusterfs_endpoints.yml
   when:
   - openshift_hosted_registry_storage_glusterfs_ips|length > 0
   - openshift_hosted_registry_storage_kind | default(none) in ['glusterfs']
@@ -141,12 +139,12 @@
       namespace: "{{ openshift_hosted_registry_namespace }}"
 
 - name: Wait for pod (Registry)
-  include: wait_for_pod.yml
+  include_tasks: wait_for_pod.yml
   vars:
     l_openshift_hosted_wait_for_pod: "{{ openshift_hosted_registry_wait }}"
     l_openshift_hosted_wfp_items: "{{ r_openshift_hosted_registry_list }}"
 
-- include: storage/glusterfs.yml
+- include_tasks: storage/glusterfs.yml
   when:
   - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap
 
diff --git a/roles/openshift_hosted/tasks/router.yml b/roles/openshift_hosted/tasks/router.yml
index 57c10b637..4e9219477 100644
--- a/roles/openshift_hosted/tasks/router.yml
+++ b/roles/openshift_hosted/tasks/router.yml
@@ -1,6 +1,6 @@
 ---
 - name: setup firewall
-  include: firewall.yml
+  import_tasks: firewall.yml
   vars:
     l_openshift_hosted_firewall_enabled: "{{ r_openshift_hosted_router_firewall_enabled }}"
     l_openshift_hosted_use_firewalld: "{{ r_openshift_hosted_router_use_firewalld }}"
@@ -100,7 +100,7 @@
   with_items: "{{ openshift_hosted_routers }}"
 
 - name: Wait for pod (Routers)
-  include: wait_for_pod.yml
+  include_tasks: wait_for_pod.yml
   vars:
     l_openshift_hosted_wait_for_pod: "{{ openshift_hosted_router_wait }}"
     l_openshift_hosted_wfp_items: "{{ openshift_hosted_routers }}"
diff --git a/roles/openshift_hosted/tasks/secure.yml b/roles/openshift_hosted/tasks/secure.yml
index ecbf5b141..378ae32dc 100644
--- a/roles/openshift_hosted/tasks/secure.yml
+++ b/roles/openshift_hosted/tasks/secure.yml
@@ -1,12 +1,10 @@
 ---
 - name: Include reencrypt route configuration
-  include: secure/reencrypt.yml
-  static: no
+  include_tasks: secure/reencrypt.yml
   when: openshift_hosted_registry_routetermination == 'reencrypt'
 
 - name: Include passthrough route configuration
-  include: secure/passthrough.yml
-  static: no
+  include_tasks: secure/passthrough.yml
   when: openshift_hosted_registry_routetermination == 'passthrough'
 
 - name: Fetch the docker-registry route
diff --git a/roles/openshift_hosted/tasks/storage/object_storage.yml b/roles/openshift_hosted/tasks/storage/object_storage.yml
index 3d1b2c68e..a8c26fb51 100644
--- a/roles/openshift_hosted/tasks/storage/object_storage.yml
+++ b/roles/openshift_hosted/tasks/storage/object_storage.yml
@@ -1,5 +1,5 @@
 ---
-- include: s3.yml
+- include_tasks: s3.yml
   when: openshift_hosted_registry_storage_provider == 's3'
 
 - name: Ensure the registry secret exists
diff --git a/roles/openshift_logging/tasks/generate_certs.yaml b/roles/openshift_logging/tasks/generate_certs.yaml
index f526fd734..082c0128f 100644
--- a/roles/openshift_logging/tasks/generate_certs.yaml
+++ b/roles/openshift_logging/tasks/generate_certs.yaml
@@ -36,7 +36,7 @@
     - top_dir: '{{generated_certs_dir}}'
   when: not signing_conf_file.stat.exists
 
-- include: procure_server_certs.yaml
+- include_tasks: procure_server_certs.yaml
   loop_control:
     loop_var: cert_info
   with_items:
@@ -45,7 +45,7 @@
     - procure_component: kibana-internal
       hostnames: "kibana, kibana-ops, {{openshift_logging_kibana_hostname}}, {{openshift_logging_kibana_ops_hostname}}"
 
-- include: procure_server_certs.yaml
+- include_tasks: procure_server_certs.yaml
   loop_control:
     loop_var: cert_info
   with_items:
@@ -53,14 +53,14 @@
       hostnames: "logging-mux, {{openshift_logging_mux_hostname}}"
   when: openshift_logging_use_mux | bool
 
-- include: procure_shared_key.yaml
+- include_tasks: procure_shared_key.yaml
   loop_control:
     loop_var: shared_key_info
   with_items:
     - procure_component: mux
   when: openshift_logging_use_mux | bool
 
-- include: procure_server_certs.yaml
+- include_tasks: procure_server_certs.yaml
   loop_control:
     loop_var: cert_info
   with_items:
@@ -68,7 +68,7 @@
       hostnames: "es, {{openshift_logging_es_hostname}}"
   when: openshift_logging_es_allow_external | bool
 
-- include: procure_server_certs.yaml
+- include_tasks: procure_server_certs.yaml
   loop_control:
     loop_var: cert_info
   with_items:
@@ -109,7 +109,7 @@
     - not ca_cert_srl_file.stat.exists
 
 - name: Generate PEM certs
-  include: generate_pems.yaml component={{node_name}}
+  include_tasks: generate_pems.yaml component={{node_name}}
   with_items:
     - system.logging.fluentd
     - system.logging.kibana
@@ -119,7 +119,7 @@
     loop_var: node_name
 
 - name: Generate PEM cert for mux
-  include: generate_pems.yaml component={{node_name}}
+  include_tasks: generate_pems.yaml component={{node_name}}
   with_items:
     - system.logging.mux
   loop_control:
@@ -127,7 +127,7 @@
   when: openshift_logging_use_mux | bool
 
 - name: Generate PEM cert for Elasticsearch external route
-  include: generate_pems.yaml component={{node_name}}
+  include_tasks: generate_pems.yaml component={{node_name}}
   with_items:
     - system.logging.es
   loop_control:
@@ -135,7 +135,7 @@
   when: openshift_logging_es_allow_external | bool
 
 - name: Creating necessary JKS certs
-  include: generate_jks.yaml
+  include_tasks: generate_jks.yaml
 
 # TODO: make idempotent
 - name: Generate proxy session
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 2fefdc894..bb8ebec6b 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -52,7 +52,7 @@
   changed_when: False
   check_mode: no
 
-- include: generate_certs.yaml
+- include_tasks: generate_certs.yaml
   vars:
     generated_certs_dir: "{{openshift.common.config_base}}/logging"
 
@@ -250,7 +250,7 @@
   when:
   - openshift_logging_use_ops | bool
 
-- include: annotate_ops_projects.yaml
+- include_tasks: annotate_ops_projects.yaml
 
 ## Curator
 - include_role:
@@ -311,4 +311,4 @@
     openshift_logging_install_eventrouter | default(false) | bool
 
 
-- include: update_master_config.yaml
+- include_tasks: update_master_config.yaml
diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml
index 7f8e88036..91db457d1 100644
--- a/roles/openshift_logging/tasks/main.yaml
+++ b/roles/openshift_logging/tasks/main.yaml
@@ -19,11 +19,11 @@
   check_mode: no
   become: no
 
-- include: install_logging.yaml
+- include_tasks: install_logging.yaml
   when:
     - openshift_logging_install_logging | default(false) | bool
 
-- include: delete_logging.yaml
+- include_tasks: delete_logging.yaml
   when:
     - not openshift_logging_install_logging | default(false) | bool
 
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml
index 7ddf57450..e7ef5ff22 100644
--- a/roles/openshift_logging_curator/tasks/main.yaml
+++ b/roles/openshift_logging_curator/tasks/main.yaml
@@ -12,7 +12,7 @@
     openshift_logging_curator_image_prefix: "{{ openshift_logging_curator_image_prefix | default(__openshift_logging_curator_image_prefix) }}"
     openshift_logging_curator_image_version: "{{ openshift_logging_curator_image_version | default(__openshift_logging_curator_image_version) }}"
 
-- include: determine_version.yaml
+- include_tasks: determine_version.yaml
 
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml
index 770892d52..8f2050043 100644
--- a/roles/openshift_logging_elasticsearch/tasks/main.yaml
+++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml
@@ -30,7 +30,7 @@
     openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_elasticsearch_image_prefix | default(__openshift_logging_elasticsearch_image_prefix) }}"
     openshift_logging_elasticsearch_image_version: "{{ openshift_logging_elasticsearch_image_version | default(__openshift_logging_elasticsearch_image_version) }}"
 
-- include: determine_version.yaml
+- include_tasks: determine_version.yaml
 
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
diff --git a/roles/openshift_logging_eventrouter/tasks/main.yaml b/roles/openshift_logging_eventrouter/tasks/main.yaml
index b1f93eeb9..96b181d61 100644
--- a/roles/openshift_logging_eventrouter/tasks/main.yaml
+++ b/roles/openshift_logging_eventrouter/tasks/main.yaml
@@ -12,8 +12,8 @@
     openshift_logging_eventrouter_image_prefix: "{{ openshift_logging_eventrouter_image_prefix | default(__openshift_logging_eventrouter_image_prefix) }}"
     openshift_logging_eventrouter_image_version: "{{ openshift_logging_eventrouter_image_version | default(__openshift_logging_eventrouter_image_version) }}"
 
-- include: "{{ role_path }}/tasks/install_eventrouter.yaml"
+- include_tasks: install_eventrouter.yaml
   when: openshift_logging_install_eventrouter | default(false) | bool
 
-- include: "{{ role_path }}/tasks/delete_eventrouter.yaml"
+- include_tasks: delete_eventrouter.yaml
   when: not openshift_logging_install_eventrouter | default(false) | bool
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml
index f8683ab75..87eedfb4b 100644
--- a/roles/openshift_logging_fluentd/tasks/main.yaml
+++ b/roles/openshift_logging_fluentd/tasks/main.yaml
@@ -47,7 +47,7 @@
     openshift_logging_fluentd_image_prefix: "{{ openshift_logging_fluentd_image_prefix | default(__openshift_logging_fluentd_image_prefix) }}"
     openshift_logging_fluentd_image_version: "{{ openshift_logging_fluentd_image_version | default(__openshift_logging_fluentd_image_version) }}"
 
-- include: determine_version.yaml
+- include_tasks: determine_version.yaml
 
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
@@ -216,7 +216,7 @@
     openshift_logging_fluentd_hosts: "{{ fluentd_hosts.results.results[0]['items'] | map(attribute='metadata.name') | list }}"
   when: "'--all' in openshift_logging_fluentd_hosts"
 
-- include: label_and_wait.yaml
+- include_tasks: label_and_wait.yaml
   vars:
     node: "{{ fluentd_host }}"
   with_items: "{{ openshift_logging_fluentd_hosts }}"
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml
index 9d99114c5..77bf8042a 100644
--- a/roles/openshift_logging_kibana/tasks/main.yaml
+++ b/roles/openshift_logging_kibana/tasks/main.yaml
@@ -15,7 +15,7 @@
     openshift_logging_kibana_proxy_image_prefix: "{{ openshift_logging_kibana_proxy_image_prefix | default(__openshift_logging_kibana_proxy_image_prefix) }}"
     openshift_logging_kibana_proxy_image_version: "{{ openshift_logging_kibana_proxy_image_version | default(__openshift_logging_kibana_proxy_image_version) }}"
 
-- include: determine_version.yaml
+- include_tasks: determine_version.yaml
 
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml
index 242d92188..68948bce2 100644
--- a/roles/openshift_logging_mux/tasks/main.yaml
+++ b/roles/openshift_logging_mux/tasks/main.yaml
@@ -20,7 +20,7 @@
     openshift_logging_mux_image_prefix: "{{ openshift_logging_mux_image_prefix | default(__openshift_logging_mux_image_prefix) }}"
     openshift_logging_mux_image_version: "{{ openshift_logging_mux_image_version | default(__openshift_logging_mux_image_version) }}"
 
-- include: determine_version.yaml
+- include_tasks: determine_version.yaml
 
 # allow passing in a tempdir
 - name: Create temp directory for doing work in
diff --git a/roles/openshift_management/tasks/main.yml b/roles/openshift_management/tasks/main.yml
index 3bade9e8c..f212dba7c 100644
--- a/roles/openshift_management/tasks/main.yml
+++ b/roles/openshift_management/tasks/main.yml
@@ -3,7 +3,7 @@
 # Users, projects, and privileges
 
 - name: Run pre-install Management validation checks
-  include: validate.yml
+  include_tasks: validate.yml
 
 # This creates a service account allowing Container Provider
 # integration (managing OCP/Origin via MIQ/Management)
@@ -18,18 +18,18 @@
     display_name: "{{ openshift_management_project_description }}"
 
 - name: Create and Authorize Management Accounts
-  include: accounts.yml
+  include_tasks: accounts.yml
 
 ######################################################################
 # STORAGE - Initialize basic storage class
 - name: Determine the correct NFS host if required
-  include: storage/nfs_server.yml
+  include_tasks: storage/nfs_server.yml
   when: openshift_management_storage_class in ['nfs', 'nfs_external']
 
 #---------------------------------------------------------------------
 # * nfs - set up NFS shares on the first master for a proof of concept
 - name: Create required NFS exports for Management app storage
-  include: storage/nfs.yml
+  include_tasks: storage/nfs.yml
   when: openshift_management_storage_class == 'nfs'
 
 #---------------------------------------------------------------------
@@ -56,14 +56,14 @@
 ######################################################################
 # APPLICATION TEMPLATE
 - name: Install the Management app and PV templates
-  include: template.yml
+  include_tasks: template.yml
 
 ######################################################################
 # APP & DB Storage
 
 # For local/external NFS backed installations
 - name: "Create the required App and DB PVs using {{ openshift_management_storage_class }}"
-  include: storage/create_nfs_pvs.yml
+  include_tasks: storage/create_nfs_pvs.yml
   when:
     - openshift_management_storage_class in ['nfs', 'nfs_external']
 
diff --git a/roles/openshift_management/tasks/storage/storage.yml b/roles/openshift_management/tasks/storage/storage.yml
index d8bf7aa3e..a3675b29b 100644
--- a/roles/openshift_management/tasks/storage/storage.yml
+++ b/roles/openshift_management/tasks/storage/storage.yml
@@ -1,3 +1,3 @@
 ---
-- include: nfs.yml
+- include_tasks: nfs.yml
   when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'))
diff --git a/roles/openshift_nfs/tasks/setup.yml b/roles/openshift_nfs/tasks/setup.yml
index edb854467..1aa7e7079 100644
--- a/roles/openshift_nfs/tasks/setup.yml
+++ b/roles/openshift_nfs/tasks/setup.yml
@@ -1,7 +1,6 @@
 ---
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 - name: Install nfs-utils
   package: name=nfs-utils state=present
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e60d96760..ae4916761 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -6,7 +6,7 @@
     - deployment_type == 'openshift-enterprise'
     - not openshift_use_crio
 
-- include: dnsmasq.yml
+- include_tasks: dnsmasq.yml
 
 - name: setup firewall
   import_tasks: firewall.yml
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'
 
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
index 4b33e91b4..315bc5614 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml
@@ -82,7 +82,7 @@
   retries: "{{ (glusterfs_timeout | int / 10) | int }}"
   when: glusterfs_heketi_wipe
 
-- include: glusterfs_deploy.yml
+- include_tasks: glusterfs_deploy.yml
   when: glusterfs_is_native
 
 - name: Create heketi service account
@@ -212,7 +212,7 @@
   when:
   - glusterfs_heketi_is_native
 
-- include: heketi_deploy_part1.yml
+- include_tasks: heketi_deploy_part1.yml
   when:
   - glusterfs_heketi_is_native
   - glusterfs_heketi_deploy_is_missing
@@ -256,7 +256,7 @@
   when:
   - glusterfs_heketi_topology_load
 
-- include: heketi_deploy_part2.yml
+- include_tasks: heketi_deploy_part2.yml
   when:
   - glusterfs_heketi_is_native
   - glusterfs_heketi_is_missing
@@ -312,8 +312,8 @@
   when:
   - glusterfs_storageclass or glusterfs_s3_deploy
 
-- include: glusterblock_deploy.yml
+- include_tasks: glusterblock_deploy.yml
   when: glusterfs_block_deploy
 
-- include: gluster_s3_deploy.yml
+- include_tasks: gluster_s3_deploy.yml
   when: glusterfs_s3_deploy
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
index 71c1311cd..73b9791eb 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
@@ -46,4 +46,4 @@
     glusterfs_heketi_fstab: "{{ openshift_storage_glusterfs_heketi_fstab }}"
     glusterfs_nodes: "{{ groups.glusterfs | default([]) }}"
 
-- include: glusterfs_common.yml
+- include_tasks: glusterfs_common.yml
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
index fa50e39a2..7466702b8 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml
@@ -46,7 +46,7 @@
     glusterfs_heketi_fstab: "{{ openshift_storage_glusterfs_registry_heketi_fstab }}"
     glusterfs_nodes: "{% if groups.glusterfs_registry is defined %}{% set nodes = groups.glusterfs_registry %}{% elif 'groups.glusterfs' is defined %}{% set nodes = groups.glusterfs %}{% else %}{% set nodes = '[]' %}{% endif %}{{ nodes }}"
 
-- include: glusterfs_common.yml
+- include_tasks: glusterfs_common.yml
   when:
   - glusterfs_nodes | default([]) | count > 0
   - "'glusterfs' not in groups or glusterfs_nodes != groups.glusterfs"
diff --git a/roles/openshift_storage_glusterfs/tasks/main.yml b/roles/openshift_storage_glusterfs/tasks/main.yml
index 728f15a21..b48bfc88e 100644
--- a/roles/openshift_storage_glusterfs/tasks/main.yml
+++ b/roles/openshift_storage_glusterfs/tasks/main.yml
@@ -5,11 +5,11 @@
   changed_when: False
   check_mode: no
 
-- include: glusterfs_config.yml
+- include_tasks: glusterfs_config.yml
   when:
   - groups.glusterfs | default([]) | count > 0
 
-- include: glusterfs_registry.yml
+- include_tasks: glusterfs_registry.yml
   when: >
     groups.glusterfs_registry | default([]) | count > 0
     or (openshift_hosted_registry_storage_kind | default(none) == 'glusterfs')
diff --git a/roles/openshift_storage_nfs_lvm/tasks/main.yml b/roles/openshift_storage_nfs_lvm/tasks/main.yml
index 49dd657b5..c8e7b6d7c 100644
--- a/roles/openshift_storage_nfs_lvm/tasks/main.yml
+++ b/roles/openshift_storage_nfs_lvm/tasks/main.yml
@@ -20,7 +20,7 @@
   file: path={{osnl_mount_dir}}/{{ item }} owner=nfsnobody group=nfsnobody mode=0700
   with_sequence: start={{osnl_volume_num_start}} count={{osnl_number_of_volumes}} format={{osnl_volume_prefix}}{{osnl_volume_size}}g%04d
 
-- include: nfs.yml
+- include_tasks: nfs.yml
 
 - name: Create volume json file
   template: src=../templates/nfs.json.j2 dest=/root/persistent-volume.{{ item }}.json
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml
index 9ca49b569..f83cf9157 100644
--- a/roles/rhel_subscribe/tasks/main.yml
+++ b/roles/rhel_subscribe/tasks/main.yml
@@ -69,7 +69,7 @@
   until: subscribe_pool | succeeded
   when: openshift_pool_id.stdout != ''
 
-- include: enterprise.yml
+- include_tasks: enterprise.yml
   when:
   - deployment_type == 'openshift-enterprise'
   - not ostree_booted.stat.exists | bool