Switch to more specific include modules for updates.

Include has some unintuitive behaviours depending on
if it is running in a static or dynamic in play or in playbook context,
in an effort to clarify behaviours move to a new set of modules:
 include_tasks, include_role, import_playbook, import_tasks.

Change-Id: I33018bcc8f4798f33f73e1aad47419d8094269c8

tasks/update/create-overcloud-update-scripts.yaml

@@ -1,14 +1,18 @@
 ---
 - name: create a comptatible deployment scripts from oooq
-  include: ../upgrade/use_oooq.yaml
+  include_tasks: ../upgrade/use_oooq.yaml
+  args:
+    apply:
+      tags:
+        - use_oooq
   tags: use_oooq
   when: use_oooq|bool
 
 - name: Convert CLI options to parameters
-  include: ../common/convert_cli_opts_params.yaml
+  import_tasks: ../common/convert_cli_opts_params.yaml
 
 - name: get auxiliary facts for major upgrades
-  include: ../common/auxilary-facts.yaml
+  import_tasks: ../common/auxilary-facts.yaml
 
 - name: create scripts with workarounds
   template:
@@ -26,10 +30,10 @@
   when: updates_workarounds|bool
 
 - name: include l3 agent tasks
-  include: ../common/create_l3_agent_connectivity_check_script.yml
+  import_tasks: ../common/create_l3_agent_connectivity_check_script.yml
 
 - name: generate roles list from inventory file
-  include: ../common/load_roles_from_inventory.yaml
+  import_tasks: ../common/load_roles_from_inventory.yaml
 
 - name: create overcloud update prepare script
   template:
@@ -83,10 +87,10 @@
     force: true
 
 - name: Create L3-agent failover scripts
-  include: ../common/create_l3_agent_failover_check_script.yml
+  import_tasks: ../common/create_l3_agent_failover_check_script.yml
 
 - name: create nova actions check script
-  include: ../common/create_nova_actions_check_script.yml
+  import_tasks: ../common/create_nova_actions_check_script.yml
 
 - name: import create HTTP test scripts
   import_tasks: ../common/create_http_test_scripts.yml

tasks/update/main.yml

@@ -1,6 +1,10 @@
 ---
 - name: create undercloud update scripts
-  include: create-undercloud-update-scripts.yaml
+  include_tasks: create-undercloud-update-scripts.yaml
+  args:
+    apply:
+      tags:
+        - create_undercloud_update_scripts
   tags: create_undercloud_update_scripts
   when: update_noop|bool or undercloud_update|bool
 
@@ -29,13 +33,17 @@
       when: updates_workarounds|bool
 
     - name: validate undercloud update
-      include: ../common/undercloud_validate_upgrade.yaml
+      import_tasks: ../common/undercloud_validate_upgrade.yaml
       tags: undercloud_update_validate
 
   when: undercloud_update|bool
 
 - name: create overcloud update scripts
-  include: create-overcloud-update-scripts.yaml
+  include_tasks: create-overcloud-update-scripts.yaml
+  args:
+    apply:
+      tags:
+        - create_overcloud_update_scripts
   tags: create_overcloud_update_scripts
   when: update_noop|bool or overcloud_update|bool
 
@@ -48,7 +56,8 @@
             {{ working_dir }}/pre_overcloud_update_prepare_workarounds.log
       when: updates_workarounds|bool
 
-    - include: overcloud_update_prepare.yml
+    - name: import oc update prepare tasks
+      import_tasks: overcloud_update_prepare.yml
       tags:
         - overcloud_update
         - overcloud_update_prepare
@@ -85,7 +94,8 @@
             {{ working_dir }}/pre_overcloud_update_run_workarounds.log
       when: updates_workarounds|bool
 
-    - include: overcloud_update_run.yml
+    - name: import overcloud update run tasks
+      import_tasks: overcloud_update_run.yml
       tags:
         - overcloud_update
 
@@ -98,7 +108,7 @@
       when: updates_workarounds|bool
 
     - name: update Ceph
-      include: ceph_update_run.yml
+      include_tasks: ceph_update_run.yml
       when: ceph_osd_enabled|bool
 
     - name: run online data migration
@@ -113,7 +123,8 @@
       when: updates_workarounds
       tags: overcloud_update_converge
 
-    - include: overcloud_update_converge.yml
+    - name: import overcloud update converge tasks
+      import_tasks: overcloud_update_converge.yml
       tags: overcloud_update_converge
 
     - name: apply post overcloud update converge workarounds
@@ -131,6 +142,7 @@
         - overcloud_update
         - overcloud_images_validate
 
-    - include: ../common/nova_actions_check.yml
+    - name: import nova_actions_check tasks
+      import_tasks: ../common/nova_actions_check.yml
 
   when: overcloud_update|bool

tasks/update/overcloud_update_converge.yml

@@ -1,5 +1,6 @@
 ---
-- include: ../common/l3_agent_connectivity_check_start_script.yml
+- name: import tasks from l3_agent_connectivity_check_start_script
+  import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
 
 - name: run minor update converge step
   shell: |
@@ -21,4 +22,5 @@
       fail: msg="Overcloud update converge step failed... :("
   when: overcloud_converge_update.rc != 0
 
-- include: ../common/l3_agent_connectivity_check_stop_script.yml
+- name: import tasks from l3_agent_connectivity_check_stop_script
+  import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml

tasks/update/overcloud_update_run.yml

@@ -1,5 +1,6 @@
 ---
-- include: ../common/l3_agent_connectivity_check_start_script.yml
+- name: import tasks from l3_agent_connectivity_check_start_script
+  import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
 
 - name: run overcloud minor update in each of the roles/hostgroups
   shell: |
@@ -16,4 +17,5 @@
   with_items: "{{ overcloud_update_nodes.results }}"
   when: item.rc != 0
 
-- include: ../common/l3_agent_connectivity_check_stop_script.yml
+- name: import tasks from l3_agent_connectivity_check_stop_script
+  import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml