openstack
/
openstack-ansible-os_magnum
Code Issues Proposed changes

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
parent 481e5c26f9 d39ef34a44
commit 3b6b25b2a1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasks/main.yml
View File

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

28
tests/test.yml
View File

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