Merge "use include_tasks instead of include"

tasks/main.yml

@@ -47,15 +47,15 @@
   tags:
     - always
 
-- include: ceilometer_pre_install.yml
+- include_tasks: ceilometer_pre_install.yml
   tags:
     - ceilometer-install
 
-- include: ceilometer_install.yml
+- include_tasks: ceilometer_install.yml
   tags:
     - ceilometer-install
 
-- include: ceilometer_post_install.yml
+- include_tasks: ceilometer_post_install.yml
   tags:
     - ceilometer-config
 
@@ -86,7 +86,7 @@
     - ceilometer-config
     - systemd-service
 
-- include: ceilometer_service_setup.yml
+- include_tasks: ceilometer_service_setup.yml
   when:
     - groups['ceilometer_central_container'] is defined and inventory_hostname == groups['ceilometer_central_container'][0]
   tags:
@@ -109,7 +109,7 @@
     - common-mq
     - ceilometer-config
 
-- include: ceilometer_db_setup.yml
+- include_tasks: ceilometer_db_setup.yml
   tags:
     - ceilometer-config
   run_once: true

tests/test.yml

@@ -14,18 +14,18 @@
 # limitations under the License.
 
 # Setup the host
-- include: common/test-setup-host.yml
+- import_playbook: common/test-setup-host.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
 
 # Needed in order to run Ceilometer Tempest test
-- include: common/test-install-glance.yml
+- import_playbook: common/test-install-glance.yml
 
-- include: test-install-ceilometer.yml
+- import_playbook: test-install-ceilometer.yml
 
 # Install and execute Tempest
-- include: common/test-install-tempest.yml
+- import_playbook: common/test-install-tempest.yml