Merge "use include_tasks instead of include"

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

View File

@ -39,15 +39,15 @@
tags:
- always
- include: designate_pre_install.yml
- include_tasks: designate_pre_install.yml
tags:
- designate-install
- include: designate_install.yml
- include_tasks: designate_install.yml
tags:
- designate-install
- include: designate_post_install.yml
- include_tasks: designate_post_install.yml
tags:
- designate-install
- designate-config
@ -103,12 +103,12 @@
- name: Flush handlers
meta: flush_handlers
- include: designate_db_setup.yml
- include_tasks: designate_db_setup.yml
when: inventory_hostname == groups['designate_all'][0]
tags:
- designate-install
- include: designate_service_setup.yml
- include_tasks: designate_service_setup.yml
when: inventory_hostname == groups['designate_all'][0]
tags:
- designate-install

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 Designate
- include: test-install-designate.yml
- import_playbook: test-install-designate.yml
# Install and execute Tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml