Merge "neutron: Add wrappers support to ovn-agent"

4 files changed, 19 insertions, 1 deletions

diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 3b0e5c835..fe7ca4b9e 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -191,6 +191,12 @@ neutron_services:
     volumes: "{{ neutron_ovn_agent_default_volumes + neutron_ovn_agent_extra_volumes }}"
     dimensions: "{{ neutron_ovn_agent_dimensions }}"
     healthcheck: "{{ neutron_ovn_agent_healthcheck }}"
+    cgroupns_mode: "{{ 'host' if neutron_agents_wrappers | bool else 'private' }}"
+    pid_mode: "{{ 'host' if neutron_agents_wrappers | bool else '' }}"
+    environment:
+      KOLLA_IMAGE: "{{ neutron_ovn_agent_image_full }}"
+      KOLLA_NAME: "neutron_ovn_agent"
+      KOLLA_NEUTRON_WRAPPERS: "{{ 'true' if neutron_agents_wrappers | bool else 'false' }}"
     cap_add:
       - DAC_OVERRIDE
       - DAC_READ_SEARCH
@@ -622,6 +628,9 @@ neutron_ovn_agent_default_volumes:
   - "/run/netns:/run/netns:shared"
   - "kolla_logs:/var/log/kolla/"
   - "{{ '/dev/shm:/dev/shm' }}"
+  - "{{ '/var/run/docker.sock:/var/run/docker.sock:ro' if neutron_agents_wrappers | bool and kolla_container_engine == 'docker' else '' }}"
+  - "{{ '/run/podman/podman.sock:/run/podman/podman.sock' if neutron_agents_wrappers | bool and kolla_container_engine == 'podman' else '' }}"
+  - "{{ '/var/lib/containers:/var/lib/containers' if neutron_agents_wrappers | bool and kolla_container_engine == 'podman' else '' }}"
 neutron_ovn_maintenance_worker_default_volumes:
   - "{{ node_config_directory }}/neutron-ovn-maintenance-worker/:{{ container_config_directory }}/:ro"
   - "kolla_logs:/var/log/kolla/"
diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml
index d9e8fb0b3..5fc18ecab 100644
--- a/ansible/roles/neutron/handlers/main.yml
+++ b/ansible/roles/neutron/handlers/main.yml
@@ -296,7 +296,10 @@
     privileged: "{{ service.privileged | default(False) }}"
     healthcheck: "{{ service.healthcheck | default(omit) }}"
     cap_add: "{{ service.cap_add | default(omit) }}"
+    cgroupns_mode: "{{ service.cgroupns_mode | default(omit) }}"
+    pid_mode: "{{ service.pid_mode | default(omit) }}"
     security_opt: "{{ service.security_opt | default(omit) }}"
+    environment: "{{ service.environment | default(omit) }}"
     systempaths_unconfined: "{{ service.systempaths_unconfined | default(omit) }}"
 
 - name: Restart neutron-ovn-vpn-agent container
diff --git a/doc/source/reference/networking/neutron.rst b/doc/source/reference/networking/neutron.rst
index d6d7b551d..4ebb622fa 100644
--- a/doc/source/reference/networking/neutron.rst
+++ b/doc/source/reference/networking/neutron.rst
@@ -346,7 +346,7 @@ Running Neutron agents subprocesses in separate containers
 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.
+restarting the neutron-ovn-agent in ml2/ovn.
 
 To enable it, modify the configuration in ``/etc/kolla/globals.yml``:
 
diff --git a/releasenotes/notes/neutron-ovn-agent-wrappers-ae9f9704184e3d68.yaml b/releasenotes/notes/neutron-ovn-agent-wrappers-ae9f9704184e3d68.yaml
new file mode 100644
index 000000000..e34dc5899
--- /dev/null
+++ b/releasenotes/notes/neutron-ovn-agent-wrappers-ae9f9704184e3d68.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    ``neutron-ovn-agent`` now supports running metadata subprocesses in
+    separate containers when ``neutron_agents_wrappers`` is true (which is
+    the default).