openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Remove neutron_keepalived_no_track variable"

Browse Source
This commit is contained in:
Zuul 2021-04-05 02:31:27 +00:00 committed by Gerrit Code Review
commit 8be83f5d5d
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -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

2
templates/l3_agent.ini.j2
View File

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

2
vars/debian.yml
View File

@ -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') }}"

2
vars/redhat.yml
View File

@ -90,5 +90,3 @@ neutron_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib
- cyrus-sasl-plain
- cyrus-sasl-md5
_neutron_keepalived_no_track: True