From 4930628136da01c942171f8b01476ef05b695750 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Mon, 20 Aug 2018 23:20:08 -0400 Subject: [PATCH] use include_tasks instead of include include is marked as deprecated since ansible 2.4[0] [0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated Change-Id: I83c9ef75eac99edcc0da0880bd80635895802366 --- tasks/main.yml | 28 +++++++++++++--------------- tasks/octavia_init_common.yml | 2 +- tests/test.yml | 18 +++++++++--------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index fe570ed4..6bc52705 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,34 +32,33 @@ tags: - always -- include: octavia_certs.yml - static: no +- include_tasks: octavia_certs.yml when: octavia_generate_certs | bool tags: - octavia-config -- include: octavia_pre_install.yml +- include_tasks: octavia_pre_install.yml tags: - octavia-install -- include: octavia_install.yml +- include_tasks: octavia_install.yml tags: - octavia-install -- include: octavia_uwsgi.yml +- include_tasks: octavia_uwsgi.yml tags: - octavia-config -- include: octavia_init_common.yml +- include_tasks: octavia_init_common.yml tags: - octavia-install -- include: octavia_service_add.yml +- include_tasks: octavia_service_add.yml run_once: true tags: - octavia-install -- include: octavia_mgmt_network.yml +- include_tasks: octavia_mgmt_network.yml run_once: true when: - octavia_neutron_management_network_uuid is not defined @@ -68,12 +67,12 @@ - octavia-install - octavia-config -- include: octavia_security_group.yml +- include_tasks: octavia_security_group.yml run_once: true tags: - octavia-install -- include: octavia_flavor_create.yml +- include_tasks: octavia_flavor_create.yml run_once: true when: - octavia_nova_flavor_uuid is not defined @@ -81,7 +80,7 @@ - octavia-install - octavia-config -- include: octavia_post_install.yml +- include_tasks: octavia_post_install.yml tags: - octavia-install - octavia-config @@ -104,22 +103,21 @@ - common-mq - octavia-config -- include: octavia_db_setup.yml +- include_tasks: octavia_db_setup.yml when: - inventory_hostname == groups['octavia_all'][0] tags: - octavia-install -- include: octavia_policy.yml +- include_tasks: octavia_policy.yml tags: - octavia-install - octavia-config -- include: octavia_amp_image.yml +- include_tasks: octavia_amp_image.yml run_once: true tags: - octavia-config - - name: Flush handlers meta: flush_handlers diff --git a/tasks/octavia_init_common.yml b/tasks/octavia_init_common.yml index e4dc494d..797ffe7b 100644 --- a/tasks/octavia_init_common.yml +++ b/tasks/octavia_init_common.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: octavia_init_systemd.yml +- include_tasks: octavia_init_systemd.yml when: - ansible_service_mgr == 'systemd' diff --git a/tests/test.yml b/tests/test.yml index 4b6f6e20..0cf75bbe 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,29 +14,29 @@ # 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 Swift -- include: common/test-install-swift.yml +- import_playbook: common/test-install-swift.yml # Install Glance -- include: common/test-install-glance.yml +- import_playbook: common/test-install-glance.yml # Install Neutron -- include: common/test-install-neutron.yml +- import_playbook: common/test-install-neutron.yml # Install Nova -- include: common/test-install-nova.yml +- import_playbook: common/test-install-nova.yml # Install Octavia -- include: test-install-octavia.yml +- import_playbook: test-install-octavia.yml # Test -- include: test-octavia.yml +- import_playbook: test-octavia.yml