diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 5f024cf74f..c519892f4a 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -297,6 +297,7 @@ neutron_openvswitch_agent_xenapi_default_volumes:
   - "{{ node_config_directory }}/neutron-openvswitch-agent-xenapi/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
   - "/lib/modules:/lib/modules:ro"
+  - "/run/openvswitch:/run/openvswitch:shared"
   - "kolla_logs:/var/log/kolla/"
   - "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_metering_agent_default_volumes:
diff --git a/releasenotes/notes/bug-1867506-3613746b8647cd73.yaml b/releasenotes/notes/bug-1867506-3613746b8647cd73.yaml
deleted file mode 100644
index 6bae317209..0000000000
--- a/releasenotes/notes/bug-1867506-3613746b8647cd73.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-fixes:
-  - |
-    Fixes ``neutron-openvswitch-agent`` native ``openvswitch``
-    firewall driver.
-    `LP#1867506 <https://launchpad.net/bugs/1867506>`__