From 172779f545ddffcc1ea0fa6535e2c59180f1dc85 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 23 Aug 2021 10:38:39 +0300 Subject: [PATCH] Replace deprecated include statement Include has been deprecated and porepared for removal from ansible 2.12 We need to replace that before upgrading ansible version. Change-Id: Ibda72a87252339c09ede9da691438908ffb4108e --- playbooks/os-cinder-install.yml | 16 ++++++++-------- playbooks/os-glance-install.yml | 6 +++--- playbooks/os-neutron-install.yml | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 25cdef3af4..1d763673c9 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -14,7 +14,7 @@ # limitations under the License. - name: Install cinder scheduler services - include: common-playbooks/cinder.yml + import_playbook: common-playbooks/cinder.yml vars: cinder_hosts: "cinder_scheduler:!cinder_api" cinder_serial: "{{ cinder_scheduler_serial | default(['1', '100%']) }}" @@ -22,7 +22,7 @@ - name: Install cinder volume services - include: common-playbooks/cinder.yml + import_playbook: common-playbooks/cinder.yml vars: cinder_hosts: "cinder_volume:!cinder_scheduler:!cinder_api" cinder_serial: "{{ cinder_backend_serial | default(['1', '100%']) }}" @@ -30,7 +30,7 @@ - name: Install cinder backup services - include: common-playbooks/cinder.yml + import_playbook: common-playbooks/cinder.yml vars: cinder_hosts: "cinder_backup:!cinder_volume:!cinder_scheduler:!cinder_api" cinder_serial: "{{ cinder_backend_serial | default(['1', '100%']) }}" @@ -38,7 +38,7 @@ - name: Install cinder API services - include: common-playbooks/cinder.yml + import_playbook: common-playbooks/cinder.yml vars: cinder_hosts: "cinder_api" cinder_serial: "{{ cinder_api_serial | default(['1', '100%']) }}" @@ -107,7 +107,7 @@ - cinder tasks: - name: Execute cinder service reload - include: common-tasks/restart-service.yml + include_tasks: common-tasks/restart-service.yml vars: service_name: "{{ item.name }}" service_action: "{{ item.action }}" @@ -137,7 +137,7 @@ # In order to ensure that the service restart does not # cause an unexpected outage, we drain the load balancer # back end for this container. - - include: common-tasks/haproxy-endpoint-manage.yml + - include_tasks: common-tasks/haproxy-endpoint-manage.yml vars: haproxy_state: disabled when: @@ -146,7 +146,7 @@ - "groups['cinder_api'] | length > 1" - name: Execute cinder service restart - include: common-tasks/restart-service.yml + include_tasks: common-tasks/restart-service.yml vars: service_name: "cinder-api" service_action: "restarted" @@ -158,7 +158,7 @@ # Now that service restart is done, we can set # the load balancer back end for this container # to available again. - - include: common-tasks/haproxy-endpoint-manage.yml + - include_tasks: common-tasks/haproxy-endpoint-manage.yml vars: haproxy_state: enabled when: "groups['cinder_api'] | length > 1" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 1ec0bc221f..bf1dc5606c 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -151,7 +151,7 @@ # In order to ensure that the service restart does not # cause an unexpected outage, we drain the load balancer # back end for this container. - - include: common-tasks/haproxy-endpoint-manage.yml + - include_tasks: common-tasks/haproxy-endpoint-manage.yml vars: haproxy_backend: glance_api-back haproxy_state: disabled @@ -161,7 +161,7 @@ - "groups['glance_api'] | length > 1" - name: Execute glance service restart - include: common-tasks/restart-service.yml + include_tasks: common-tasks/restart-service.yml vars: service_name: "glance-api" service_action: "restarted" @@ -173,7 +173,7 @@ # Now that service restart is done, we can set # the load balancer back end for this container # to available again. - - include: common-tasks/haproxy-endpoint-manage.yml + - include_tasks: common-tasks/haproxy-endpoint-manage.yml vars: haproxy_backend: glance_api-back haproxy_state: enabled diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 01779fe63d..eac4d369fb 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -19,7 +19,7 @@ tags: - neutron tasks: - - include: common-tasks/dynamic-grouping.yml + - import_tasks: common-tasks/dynamic-grouping.yml vars: src_group: "nova_compute" dest_group: "neutron_l3_agent, neutron_metadata_agent" @@ -28,7 +28,7 @@ - name: Install neutron server - include: common-playbooks/neutron.yml + import_playbook: common-playbooks/neutron.yml vars: neutron_hosts: "neutron_server" neutron_serial: "{{ neutron_server_serial | default(['1', '100%']) }}" @@ -36,7 +36,7 @@ - name: Install neutron L2 agents - include: common-playbooks/neutron.yml + import_playbook: common-playbooks/neutron.yml vars: neutron_hosts: "neutron_linuxbridge_agent:neutron_openvswitch_agent:!neutron_server" neutron_serial: "{{ neutron_agent_serial | default('50%') }}" @@ -44,7 +44,7 @@ - name: Install all other neutron agents - include: common-playbooks/neutron.yml + import_playbook: common-playbooks/neutron.yml vars: neutron_hosts: "neutron_all:!neutron_linuxbridge_agent:!neutron_openvswitch_agent:!neutron_server" neutron_serial: "{{ neutron_other_serial | default('1') }}"