use include_tasks instead of include

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: I9d70ec2b84cfb1ccd465e52c96addfadf248f3d1
This commit is contained in:
ZhijunWei 2018-08-19 12:57:26 -04:00 committed by weizj
parent d819a2ac54
commit 1ccaa81bc7
3 changed files with 15 additions and 18 deletions

View File

@ -25,39 +25,37 @@
tags:
- always
- include: gnocchi_pre_install.yml
- include_tasks: gnocchi_pre_install.yml
tags:
- gnocchi-install
- include: gnocchi_install.yml
- include_tasks: gnocchi_install.yml
tags:
- gnocchi-install
- include: gnocchi_post_install.yml
static: no
- include_tasks: gnocchi_post_install.yml
when: not gnocchi_identity_only | bool
tags:
- gnocchi-config
- include: "gnocchi_init_{{ ansible_service_mgr }}.yml"
- include_tasks: "gnocchi_init_{{ ansible_service_mgr }}.yml"
when: not gnocchi_identity_only | bool
tags:
- gnocchi-config
- include: gnocchi_service_setup.yml
static: no
- include_tasks: gnocchi_service_setup.yml
when:
- inventory_hostname == groups['gnocchi_all'][0]
- not gnocchi_identity_only | bool
tags:
- gnocchi-config
- include: gnocchi_identity_setup.yml
- include_tasks: gnocchi_identity_setup.yml
when: inventory_hostname == groups['gnocchi_all'][0]
tags:
- gnocchi-config
- include: gnocchi_ceph_python_libs.yml
- include_tasks: gnocchi_ceph_python_libs.yml
when:
- gnocchi_storage_driver == 'ceph'
tags:
@ -65,15 +63,14 @@
# N.B. Must occur after identity setup, as this may perform calls to Swift.
# Similarly, when using Ceph, must occur after Ceph setup.
- include: gnocchi_db_setup.yml
- include_tasks: gnocchi_db_setup.yml
when:
- inventory_hostname == groups['gnocchi_all'][0]
- not gnocchi_identity_only | bool
tags:
- gnocchi-config
- include: gnocchi_apache.yml
static: no
- include_tasks: gnocchi_apache.yml
when:
- gnocchi_use_mod_wsgi | bool
- not gnocchi_identity_only | bool

View File

@ -20,7 +20,7 @@
vars_files:
- common/test-vars.yml
pre_tasks:
- include: common/create-grant-db.yml
- include_tasks: common/create-grant-db.yml
db_password: "{{ gnocchi_container_mysql_password }}"
db_name: "gnocchi"
roles:

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 Gnocchi
- include: test-install-gnocchi.yml
- import_playbook: test-install-gnocchi.yml
# Test Gnocchi
- include: test-gnocchi-functional.yml
- import_playbook: test-gnocchi-functional.yml