diff --git a/ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2 b/ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2 index ca28b279b7..2c0bb70259 100644 --- a/ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2 +++ b/ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2 @@ -2,12 +2,14 @@ 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. neutron-netns-cleanup \ --config-file /etc/neutron/neutron.conf \ --config-file /etc/neutron/l3_agent.ini \ --config-file /etc/neutron/fwaas_driver.ini \ --force --agent-type l3 +{% endif %} neutron-l3-agent \ --config-file /etc/neutron/neutron.conf \