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
This commit is contained in:
Radosław Piliszek 2020-03-31 09:01:02 +02:00
parent 5659177026
commit c033ddca08
2 changed files with 1 additions and 6 deletions

View File

@ -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:

View File

@ -1,6 +0,0 @@
---
fixes:
- |
Fixes ``neutron-openvswitch-agent`` native ``openvswitch``
firewall driver.
`LP#1867506 <https://launchpad.net/bugs/1867506>`__