Include Deprecation: Convert to include_tasks

4 files changed, 11 insertions, 15 deletions

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