From c033ddca082618062bdd3abe4b4e7ed111063cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Tue, 31 Mar 2020 09:01:02 +0200
Subject: [PATCH] Fix ovs fw driver for the other ovs agent
In [1] only neutron-openvswitch-agent was fixed and not xenapi.
That merged in Ussuri and went cleanly into Train.
In Stein and Rocky, the backport was not clean and
accidentally fixed xenapi instead of the regular one.
Neither the original bug nor its incomplete fix were released,
except for Rocky. :-(
Hence this patch also removes the confusing reno instead of
adding a new one.
[1] https://review.opendev.org/713129
Change-Id: I331417c8d61ba6f180bcafa943be697418326645
Closes-bug: #1869832
Related-bug: #1867506
---
ansible/roles/neutron/defaults/main.yml | 1 +
releasenotes/notes/bug-1867506-3613746b8647cd73.yaml | 6 ------
2 files changed, 1 insertion(+), 6 deletions(-)
delete mode 100644 releasenotes/notes/bug-1867506-3613746b8647cd73.yaml
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>`__
--
GitLab