openstack
/
zun
Code Issues Proposed changes

Work with pyroute2 0.6.4 

pyroute2 0.6.4 seems to break us due to their packages split. This
commit attempts to fix it by making sure we import modules correctly.

Change-Id: Iaf3571f1b33f99fa4f249aff46b1d89ac2168c8e
This commit is contained in:
Hongbin Lu 2021-09-26 16:56:21 +08:00
parent ca703064cd
commit a402e3b7d8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zun/cni/binding/base.py
View File

@ -17,6 +17,7 @@ import os_vif
from oslo_config import cfg
from oslo_log import log as logging
import pyroute2
from pyroute2 import netns as pyroute_netns
from stevedore import driver as stv_driver
from zun.cni import utils
@ -62,14 +63,14 @@ def _enable_ipv6(netns):
try:
path = utils.convert_netns('/proc/self/ns/net')
self_ns_fd = open(path)
pyroute2.netns.setns(netns)
pyroute_netns.setns(netns)
path = utils.convert_netns('/proc/sys/net/ipv6/conf/all/disable_ipv6')
with open(path, 'w') as disable_ipv6:
disable_ipv6.write('0')
except Exception:
raise
finally:
pyroute2.netns.setns(self_ns_fd)
pyroute_netns.setns(self_ns_fd)
@privileged.cni.entrypoint