Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-17 05:23:40 +00:00 committed by Gerrit Code Review
commit 3b6b25b2a1
2 changed files with 20 additions and 20 deletions

View File

@ -23,15 +23,15 @@
tags:
- always
- include: magnum_pre_install.yml
- include_tasks: magnum_pre_install.yml
tags:
- magnum-install
- include: magnum_install.yml
- include_tasks: magnum_install.yml
tags:
- magnum-install
- include: magnum_post_install.yml
- include_tasks: magnum_post_install.yml
tags:
- magnum-config
@ -82,16 +82,16 @@
- common-mq
- magnum-config
- include: magnum_db_setup.yml
- include_tasks: magnum_db_setup.yml
when: inventory_hostname == groups['magnum_all'][0]
tags:
- magnum-config
- include: magnum_uwsgi.yml
- include_tasks: magnum_uwsgi.yml
tags:
- magnum-config
- include: magnum_service_setup.yml
- include_tasks: magnum_service_setup.yml
when: inventory_hostname == groups['magnum_all'][0]
tags:
- magnum-config

View File

@ -15,43 +15,43 @@
# limitations under the License.
# Prepare the hosts
- include: common/test-setup-host.yml
- import_playbook: common/test-setup-host.yml
# Install haproxy
- include: test-install-haproxy.yml
- import_playbook: test-install-haproxy.yml
# Prepare the cinder-volumes VG
- include: common/test-setup-cinder-localhost.yml
- import_playbook: common/test-setup-cinder-localhost.yml
# Install memcached
- include: common/test-install-memcached.yml
- import_playbook: common/test-install-memcached.yml
# Install galera
- include: common/test-install-galera.yml
- import_playbook: common/test-install-galera.yml
# Install rabbitmq
- include: common/test-install-rabbitmq.yml
- import_playbook: common/test-install-rabbitmq.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 cinder
- include: common/test-install-cinder.yml
- import_playbook: common/test-install-cinder.yml
# Install nova
- include: common/test-install-nova.yml
- import_playbook: common/test-install-nova.yml
# Install neutron
- include: common/test-install-neutron.yml
- import_playbook: common/test-install-neutron.yml
# Install heat
- include: common/test-install-heat.yml
- import_playbook: common/test-install-heat.yml
# Install magnum
- include: test-install-magnum.yml
- import_playbook: test-install-magnum.yml
# Install and execute tempest
- include: common/test-install-tempest.yml
- import_playbook: common/test-install-tempest.yml