openstack/openstack-ansible-os_trove
Code Issues Proposed changes

use include_tasks instead of include

Browse Source 
include is marked as deprecated since ansible 2.4[0]

Switch to include_tasks or import_playbook as necessary

[0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated

Change-Id: I2351c93c2ce5beb44404dc05b487f40e14973810
This commit is contained in:
caoyuan 2018-07-24 18:58:51 +08:00
parent b832b8a7c6
commit d21b6809e9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/main.yml
View File

@ -35,20 +35,20 @@
tags: tags:
- always - always
- include: trove_pre_install.yml - include_tasks: trove_pre_install.yml
tags: tags:
- trove-install - trove-install
- include: trove_install.yml - include_tasks: trove_install.yml
tags: tags:
- trove-install - trove-install
- include: trove_service_network.yml - include_tasks: trove_service_network.yml
tags: tags:
- trove-install - trove-install
- trove-config - trove-config
- include: trove_post_install.yml - include_tasks: trove_post_install.yml
tags: tags:
- trove-install - trove-install
- trove-config - trove-config
@ -81,7 +81,7 @@
- trove-config - trove-config
- systemd-service - systemd-service
- include: trove_service_setup.yml - include_tasks: trove_service_setup.yml
when: inventory_hostname == groups['trove_api'][0] when: inventory_hostname == groups['trove_api'][0]
tags: tags:
- trove-install - trove-install
@ -105,13 +105,12 @@
- common-mq - common-mq
- trove-config - trove-config
- include: trove_db_setup.yml - include_tasks: trove_db_setup.yml
when: inventory_hostname == groups['trove_conductor'][0] when: inventory_hostname == groups['trove_conductor'][0]
tags: tags:
- trove-install - trove-install
- include: trove_apache.yml - include_tasks: trove_apache.yml
static: no
when: trove_use_mod_wsgi | bool when: trove_use_mod_wsgi | bool
tags: tags:
- trove-install - trove-install

10
tests/test.yml
View File

@ -17,16 +17,16 @@
# (c) 2016 Paul Stevens <paul.stevens@is.co.za> # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
# Setup the host # Setup the host
- include: common/test-setup-host.yml - import_playbook: common/test-setup-host.yml
# Install RabbitMQ/MariaDB # Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml - import_playbook: common/test-install-infra.yml
# Install keystone # Install keystone
- include: common/test-install-keystone.yml - import_playbook: common/test-install-keystone.yml
# Install trove # Install trove
- include: test-install-trove.yml - import_playbook: test-install-trove.yml
# Install and execute Tempest # Install and execute Tempest
- include: common/test-install-tempest.yml - import_playbook: common/test-install-tempest.yml