Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-17 19:44:07 +00:00 committed by Gerrit Code Review
commit a7061507e1
2 changed files with 11 additions and 11 deletions

View File

@ -41,15 +41,15 @@
tags:
- always
- include: barbican_pre_install.yml
- include_tasks: barbican_pre_install.yml
tags:
- barbican-install
- include: barbican_install.yml
- include_tasks: barbican_install.yml
tags:
- barbican-install
- include: barbican_post_install.yml
- include_tasks: barbican_post_install.yml
tags:
- barbican-config
@ -99,13 +99,13 @@
- common-mq
- barbican-config
- include: barbican_db_setup.yml
- include_tasks: barbican_db_setup.yml
when:
- inventory_hostname == groups['barbican_all'][0]
tags:
- barbican-config
- include: barbican_service_setup.yml
- include_tasks: barbican_service_setup.yml
when:
- inventory_hostname == groups['barbican_all'][0]
tags:

View File

@ -14,19 +14,19 @@
# limitations under the License.
# Setup the host
- include: common/test-setup-host.yml
- import_playbook: common/test-setup-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 Barbican
- include: test-install-barbican.yml
- import_playbook: test-install-barbican.yml
# Install Tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml