openstack/kolla-ansible
Code Issues Proposed changes

Merge "Clear all l3 related namespace before starting neutron-l3-agent only when l3_ha is enable"

Browse Source
This commit is contained in:
Zuul 2018-08-09 07:44:50 +00:00 committed by Gerrit Code Review
commit aebddc90f8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2
View File

@ -2,12 +2,14 @@
set -o errexit set -o errexit
{% if enable_neutron_agent_ha | bool %}
# NOTE(jeffrey4l): Remove all l3 related netns in case of multiple active routers in l3 high available mode. # NOTE(jeffrey4l): Remove all l3 related netns in case of multiple active routers in l3 high available mode.
neutron-netns-cleanup \ neutron-netns-cleanup \
--config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/l3_agent.ini \ --config-file /etc/neutron/l3_agent.ini \
--config-file /etc/neutron/fwaas_driver.ini \ --config-file /etc/neutron/fwaas_driver.ini \
--force --agent-type l3 --force --agent-type l3
{% endif %}
neutron-l3-agent \ neutron-l3-agent \
--config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/neutron.conf \