From 55df48c58ff33591b0fbee6d3febfd9839e0cc56 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 12:43:44 -0400 Subject: [PATCH] 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: Idf00933d271b5e80bda9113ccaa1f3bc71eb60c6 --- tasks/main.yml | 14 +++++++------- tasks/sahara_init_common.yml | 2 +- tests/test.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index c20aa4f..6b755bb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,23 +23,23 @@ tags: - always -- include: sahara_pre_install.yml +- include_tasks: sahara_pre_install.yml tags: - sahara-install -- include: sahara_install.yml +- include_tasks: sahara_install.yml tags: - sahara-install -- include: sahara_post_install.yml +- include_tasks: sahara_post_install.yml tags: - sahara-config -- include: sahara_uwsgi.yml +- include_tasks: sahara_uwsgi.yml tags: - sahara-config -- include: sahara_init_common.yml +- include_tasks: sahara_init_common.yml tags: - sahara-config @@ -63,12 +63,12 @@ - common-mq - sahara-config -- include: sahara_db_setup.yml +- include_tasks: sahara_db_setup.yml when: inventory_hostname == groups['sahara_all'][0] tags: - sahara-config -- include: sahara_service_setup.yml +- include_tasks: sahara_service_setup.yml when: inventory_hostname == groups['sahara_all'][0] tags: - sahara-config diff --git a/tasks/sahara_init_common.yml b/tasks/sahara_init_common.yml index 59879e0..295baad 100644 --- a/tasks/sahara_init_common.yml +++ b/tasks/sahara_init_common.yml @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: sahara_init_systemd.yml +- include_tasks: sahara_init_systemd.yml when: - ansible_service_mgr == 'systemd' diff --git a/tests/test.yml b/tests/test.yml index 54845f1..0287f09 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,19 +14,19 @@ # 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 Nova -- include: common/test-install-nova.yml +- import_playbook: common/test-install-nova.yml # Install Sahara -- include: common/test-install-sahara.yml +- import_playbook: common/test-install-sahara.yml # Install and execute Tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml