Merge "use include_tasks instead of include"

tasks/main.yml

@@ -25,20 +25,20 @@
   tags:
     - always
 
-- include: tempest_install.yml
+- include_tasks: tempest_install.yml
   tags:
     - tempest-install
 
-- include: tempest_resources.yml
+- include_tasks: tempest_resources.yml
   run_once: yes
   tags:
     - tempest-config
 
-- include: tempest_post_install.yml
+- include_tasks: tempest_post_install.yml
   tags:
     - tempest-config
 
-- include: tempest_run.yml
+- include_tasks: tempest_run.yml
   when: tempest_run | bool
   tags:
     - tempest-config

tests/test.yml

@@ -14,31 +14,31 @@
 # limitations under the License.
 
 # Prepare the user ssh keys
-- include: common/test-prepare-keys.yml
+- import_playbook: common/test-prepare-keys.yml
 
 # Prepare the host
-- include: common/test-prepare-host.yml
+- import_playbook: common/test-prepare-host.yml
 
 # Prepare the containers
-- include: common/test-prepare-containers.yml
+- import_playbook: common/test-prepare-containers.yml
 
 # Install RabbitMQ/MariaDB
-- include: common/test-install-infra.yml
+- import_playbook: common/test-install-infra.yml
 
 # Install Keystone
-- include: common/test-install-keystone.yml
+- import_playbook: common/test-install-keystone.yml
 
 # Install Glance
-- include: common/test-install-glance.yml
+- import_playbook: common/test-install-glance.yml
 
 # Install Neutron
-- include: common/test-install-neutron.yml
+- import_playbook: common/test-install-neutron.yml
 
 # Install Nova
-- include: common/test-install-nova.yml
+- import_playbook: common/test-install-nova.yml
 
 # Install and execute Tempest
-- include: common/test-install-tempest.yml
+- import_playbook: common/test-install-tempest.yml
 
 # Check whether Tempest executed successfully
-- include: test-tempest-functional.yml
+- import_playbook: test-tempest-functional.yml