Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-09-08 16:11:42 +00:00 committed by Gerrit Code Review
commit ee7531a932
2 changed files with 12 additions and 13 deletions

View File

@ -35,20 +35,20 @@
tags:
- always
- include: trove_pre_install.yml
- include_tasks: trove_pre_install.yml
tags:
- trove-install
- include: trove_install.yml
- include_tasks: trove_install.yml
tags:
- trove-install
- include: trove_service_network.yml
- include_tasks: trove_service_network.yml
tags:
- trove-install
- trove-config
- include: trove_post_install.yml
- include_tasks: trove_post_install.yml
tags:
- trove-install
- trove-config
@ -81,7 +81,7 @@
- trove-config
- systemd-service
- include: trove_service_setup.yml
- include_tasks: trove_service_setup.yml
when: inventory_hostname == groups['trove_api'][0]
tags:
- trove-install
@ -105,13 +105,12 @@
- common-mq
- trove-config
- include: trove_db_setup.yml
- include_tasks: trove_db_setup.yml
when: inventory_hostname == groups['trove_conductor'][0]
tags:
- trove-install
- include: trove_apache.yml
static: no
- include_tasks: trove_apache.yml
when: trove_use_mod_wsgi | bool
tags:
- trove-install

View File

@ -17,16 +17,16 @@
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
# 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
# Install trove
- include: test-install-trove.yml
- import_playbook: test-install-trove.yml
# Install and execute Tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml