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

3 files changed, 14 insertions, 14 deletions

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