openstack/manila
Code Issues Proposed changes

Merge "Fix manage share server for container in Focal"

Browse Source
This commit is contained in:
Zuul 2020-09-21 19:14:14 +00:00 committed by Gerrit Code Review
commit 4f0a61af39
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/share/drivers/container/container_helper.py
View File

@ -149,7 +149,7 @@ class DockerExecHelper(driver.ExecuteMixin):
interfaces = self._execute("ovs-vsctl", "list", "interface", interfaces = self._execute("ovs-vsctl", "list", "interface",
run_as_root=True)[0] run_as_root=True)[0]
veths = set(re.findall("veth[0-9a-zA-Z]{7}", interfaces)) veths = set(re.findall("veth[0-9a-zA-Z]{7}", interfaces))
manila_re = "manila-container=\".*\"" manila_re = "manila-container=\"?.{%s}\"?" % len(name)
for veth in veths: for veth in veths:
try: try:
iface_data = self._execute("ovs-vsctl", "list", "interface", iface_data = self._execute("ovs-vsctl", "list", "interface",

8
releasenotes/notes/bug-1896322-container-fix-search-veth-regex-7f2156a6fd411bdb.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixed an issue on Container driver when managing share servers. The regex
used to search for container-name in the available network interfaces
was updated to support newer versions of Open vSwitch. Refer to the
`Bug #1896322 <https://bugs.launchpad.net/manila/+bug/1896322>`_ for more
details.