Merge "Convert dynamic includes to static imports"

tasks/main.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-- include_tasks: neutron_check.yml
+- import_tasks: neutron_check.yml
 
 - name: Gather variables for each operating system
   include_vars: "{{ item }}"
@@ -49,8 +49,8 @@
   tags:
     - always
 
-- include_tasks: dependent_neutron_roles.yml
-- include_tasks: neutron_ml2_ovs_powervm.yml
+- import_tasks: dependent_neutron_roles.yml
+- import_tasks: neutron_ml2_ovs_powervm.yml
   when:
     - neutron_os_type is defined
     - neutron_os_type == 'powervm'
@@ -59,11 +59,11 @@
   tags:
     - neutron-config
 
-- include_tasks: neutron_pre_install.yml
+- import_tasks: neutron_pre_install.yml
   tags:
     - neutron-install
 
-- include_tasks: neutron_install.yml
+- import_tasks: neutron_install.yml
   tags:
     - neutron-install
 
@@ -85,7 +85,7 @@
   tags:
     - neutron-install
 
-- include_tasks: neutron_post_install.yml
+- import_tasks: neutron_post_install.yml
   tags:
     - neutron-config
 
@@ -140,20 +140,20 @@
     - common-mq
     - neutron-config
 
-- include_tasks: neutron_db_setup.yml
+- import_tasks: neutron_db_setup.yml
   when:
     - "neutron_services['neutron-server']['group'] in group_names"
   tags:
     - neutron-config
 
-- include_tasks: neutron_service_setup.yml
+- import_tasks: neutron_service_setup.yml
   when:
     - "neutron_services['neutron-server']['group'] in group_names"
     - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - neutron-config
 
-- include_tasks: neutron_l3_ha.yml
+- import_tasks: neutron_l3_ha.yml
   when:
     - "neutron_services['neutron-l3-agent']['group'] in group_names"
   tags:

tasks/neutron_install.yml

@@ -47,7 +47,7 @@
   with_items: "{{ neutron_remove_distro_packages }}"
 
 - name: Install neutron packages from PIP
-  include_tasks: neutron_install_source.yml
+  import_tasks: neutron_install_source.yml
   when: neutron_install_method == 'source'
 
 - name: Initialise the upgrade facts
@@ -98,7 +98,7 @@
       {{ apparmor_hosts | unique }}
   when: ansible_pkg_mgr in ['apt', 'zypper']
 
-- include_tasks: neutron_apparmor.yml
+- import_tasks: neutron_apparmor.yml
   when:
     - ansible_pkg_mgr in ['apt', 'zypper']
     - inventory_hostname in neutron_apparmor_hosts

tasks/providers/opendaylight_config.yml

@@ -40,5 +40,5 @@
     - opendaylight-install
     - opendaylight-pip-packages
 
-- include_tasks: setup_ovs_opendaylight.yml
+- import_tasks: setup_ovs_opendaylight.yml
   when: neutron_services['neutron-server']['group'] not in group_names