From da4924577f934057762eec1866958b38f2e59cd0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 14 Jan 2021 15:22:37 +0200 Subject: [PATCH] Remove neutron_keepalived_no_track variable Neutron has deprecated [1] usage of keepalived_use_no_track since it is capable of distinguishing when no_track should and where should not be used. [1] https://review.opendev.org/c/openstack/neutron/+/759657 Depends-On: I351b3f2ae458abc14a899768a04999ca10c86ea4 Change-Id: Ia343cdb2268ef19d0e6270322b4ba5b97a069673 --- defaults/main.yml | 5 ----- templates/l3_agent.ini.j2 | 2 -- vars/debian.yml | 2 -- vars/redhat.yml | 2 -- 4 files changed, 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d460116c..4c9a850e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -381,11 +381,6 @@ neutron_local_ip: 127.0.0.1 ### L3 Agent Plugin Configuration ### -# Enable/disable no_track for keepalived (available for keepalived >2.0) -# NOTE(noonedeadpunk): Is is done until the merge and backport of the fix for -# https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1896506 -neutron_keepalived_no_track: "{{ _neutron_keepalived_no_track | default(True) }}" - # L3HA configuration options neutron_ha_vrrp_auth_type: PASS neutron_l3_ha_net_cidr: 169.254.192.0/18 diff --git a/templates/l3_agent.ini.j2 b/templates/l3_agent.ini.j2 index 9a5e5193..b6b6a889 100644 --- a/templates/l3_agent.ini.j2 +++ b/templates/l3_agent.ini.j2 @@ -23,8 +23,6 @@ cleanup_on_shutdown = {{ neutron_l3_cleanup_on_shutdown }} # Metadata enable_metadata_proxy = True -keepalived_use_no_track = {{ neutron_keepalived_no_track }} - # L3 plugins {% set l3_agent_plugins = [] %} diff --git a/vars/debian.yml b/vars/debian.yml index e7e3d522..8e86f3e0 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -104,5 +104,3 @@ neutron_remove_distro_packages: neutron_oslomsg_amqp1_distro_packages: - libsasl2-modules - sasl2-bin - -_neutron_keepalived_no_track: "{{ (ansible_distribution_major_version is version('20', '>=') or ansible_distribution | lower == 'debian') }}" diff --git a/vars/redhat.yml b/vars/redhat.yml index b7b66c1b..9ec51303 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -90,5 +90,3 @@ neutron_oslomsg_amqp1_distro_packages: - cyrus-sasl-lib - cyrus-sasl-plain - cyrus-sasl-md5 - -_neutron_keepalived_no_track: True