openstack
/
openstack-ansible-os_heat
Code Issues Proposed changes

Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-16 07:18:04 +00:00 committed by Gerrit Code Review
parent 0b7ae51518 6170df0834
commit 494ce66255
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/main.yml
View File

@ -47,15 +47,15 @@
tags:
- always
- include: heat_pre_install.yml
- include_tasks: heat_pre_install.yml
tags:
- heat-install
- include: heat_install.yml
- include_tasks: heat_install.yml
tags:
- heat-install
- include: heat_post_install.yml
- include_tasks: heat_post_install.yml
tags:
- heat-config
@ -87,7 +87,7 @@
- heat-config
- systemd-service
- include: heat_domain_setup.yml
- include_tasks: heat_domain_setup.yml
static: no
when:
- "inventory_hostname == ansible_play_hosts[0]"
@ -114,18 +114,18 @@
- common-mq
- heat-config
- include: heat_db_setup.yml
- include_tasks: heat_db_setup.yml
static: no
when:
- "inventory_hostname == ansible_play_hosts[0]"
tags:
- heat-config
- include: heat_uwsgi.yml
- include_tasks: heat_uwsgi.yml
tags:
- heat-config
- include: heat_service_setup.yml
- include_tasks: heat_service_setup.yml
static: no
when:
- "inventory_hostname == ansible_play_hosts[0]"

10
tests/test.yml
View File

@ -14,16 +14,16 @@
# limitations under the License.
# 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 Heat
- include: common/test-install-heat.yml
- import_playbook: common/test-install-heat.yml
# Test Heat
- include: test-heat-functional.yml
- import_playbook: test-heat-functional.yml