aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/neutron/defaults/main.yml2
-rw-r--r--doc/source/reference/networking/neutron.rst2
-rw-r--r--etc/kolla/globals.yml3
-rw-r--r--releasenotes/notes/neutron-agent-wrappers-by-default-c48bc7c00fcca011.yaml8
4 files changed, 13 insertions, 2 deletions
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 44f5426bd..5ff4c63c0 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -757,7 +757,7 @@ neutron_l3_agent_host_ipv6_neigh_gc_thresh3: "{{ neutron_l3_agent_host_ipv4_neig
neutron_api_workers: "{{ openstack_service_workers }}"
neutron_metadata_workers: "{{ openstack_service_workers }}"
-neutron_agents_wrappers: "no"
+neutron_agents_wrappers: "yes"
####################
# Subprojects
diff --git a/doc/source/reference/networking/neutron.rst b/doc/source/reference/networking/neutron.rst
index 82b4321f4..264f2366f 100644
--- a/doc/source/reference/networking/neutron.rst
+++ b/doc/source/reference/networking/neutron.rst
@@ -339,7 +339,7 @@ In this example:
Running Neutron agents subprocesses in separate containers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-There is an experimental feature in Kolla-Ansible that allows to overcome
+There is a feature in Kolla-Ansible that allows to overcome
the issue of breaking data plane connectivity, dhcp and metadata services
when restarting neutron-l3-agent and neutron-dhcp-agent in ml2/ovs or
restarting the neutron-ovn-metadata-agent in ml2/ovn.
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index cb0e651d5..70d55940d 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -175,6 +175,9 @@ workaround_ansible_issue_8743: yes
# Neutron rolling upgrade were enable by default
#neutron_enable_rolling_upgrade: "yes"
+# Enable wrapper containers to keep Neutron agent restarts isolated from the main service containers
+#neutron_agents_wrappers: "yes"
+
# Configure neutron logging framework to log ingress/egress connections to instances
# for security groups rules. More information can be found here:
# https://docs.openstack.org/neutron/latest/admin/config-logging.html
diff --git a/releasenotes/notes/neutron-agent-wrappers-by-default-c48bc7c00fcca011.yaml b/releasenotes/notes/neutron-agent-wrappers-by-default-c48bc7c00fcca011.yaml
new file mode 100644
index 000000000..1b7464f8a
--- /dev/null
+++ b/releasenotes/notes/neutron-agent-wrappers-by-default-c48bc7c00fcca011.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+ - |
+ Neutron agent wrappers are now enabled by default. The wrapper containers
+ restart DHCP, L3, and related agents without having to respawn the main
+ service containers, which reduces dataplane disruptions during upgrades and
+ restarts. Operators who need the previous behaviour can set
+ ``neutron_agents_wrappers`` to ``"no"`` in ``/etc/kolla/globals.yml``.