Merge "Remove neutron_keepalived_no_track variable"

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

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 = [] %}
 

vars/debian.yml

@@ -99,5 +99,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') }}"

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