Skip to content

Commit c7b1616

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "neutron: Do not run netns-cleanup when wrappers are enabled" into stable/2025.1
2 parents db3a651 + 241ef3c commit c7b1616

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -o errexit
44

5+
{% if not neutron_agents_wrappers | bool %}
56
{% if enable_neutron_agent_ha | bool %}
67
# NOTE(jeffrey4l): Remove all l3 related netns in case of multiple active routers in l3 high available mode.
78
neutron-netns-cleanup \
@@ -12,6 +13,7 @@ neutron-netns-cleanup \
1213
{% endif %}
1314
--force --agent-type l3
1415
{% endif %}
16+
{% endif %}
1517

1618
neutron-l3-agent \
1719
--config-file /etc/neutron/neutron.conf \

0 commit comments

Comments
 (0)