openstack
/
neutron-vpnaas
Code Issues Proposed changes

Merge "Execute neutron-vpn-netns-wrapper with rootwrap_config argument"

This commit is contained in:
Zuul 2019-05-02 19:34:06 +00:00 committed by Gerrit Code Review
parent ed1c44c36b 7e9922858f
commit a3a9f27b8b
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron_vpnaas/services/vpn/device_drivers/ipsec.py
View File

@ -279,6 +279,13 @@ class BaseSwanProcess(object):
{'vpnservice': vpnservice,
'state_path': self.conf.state_path})
def _get_rootwrap_config(self):
if 'neutron-rootwrap' in cfg.CONF.AGENT.root_helper:
rh_tokens = cfg.CONF.AGENT.root_helper.split(' ')
if len(rh_tokens) == 3 and os.path.exists(rh_tokens[2]):
return rh_tokens[2]
return None
@abc.abstractmethod
def get_status(self):
pass

3
neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py
View File

@ -29,6 +29,7 @@ class LibreSwanProcess(ipsec.OpenSwanProcess):
"""
# pylint: disable=useless-super-delegation
def __init__(self, conf, process_id, vpnservice, namespace):
self._rootwrap_cfg = self._get_rootwrap_config()
super(LibreSwanProcess, self).__init__(conf, process_id,
vpnservice, namespace)
@ -47,6 +48,8 @@ class LibreSwanProcess(ipsec.OpenSwanProcess):
return ip_wrapper.netns.execute(
[NS_WRAPPER,
'--mount_paths=%s' % mount_paths_str,
('--rootwrap_config=%s' % self._rootwrap_cfg
if self._rootwrap_cfg else ''),
'--cmd=%s,%s' % (self.binary, ','.join(cmd))],
check_exit_code=check_exit_code,
extra_ok_codes=extra_ok_codes)

3
neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py
View File

@ -82,6 +82,7 @@ class StrongSwanProcess(ipsec.BaseSwanProcess):
self.DIALECT_MAP['v2'] = 'ikev2'
self.DIALECT_MAP['sha256'] = 'sha256'
self._strongswan_piddir = self._get_strongswan_piddir()
self._rootwrap_cfg = self._get_rootwrap_config()
LOG.debug("strongswan piddir is '%s'", (self._strongswan_piddir))
super(StrongSwanProcess, self).__init__(conf, process_id,
vpnservice, namespace)
@ -115,6 +116,8 @@ class StrongSwanProcess(ipsec.BaseSwanProcess):
[NS_WRAPPER,
'--mount_paths=/etc:%s/etc,%s:%s/var/run' % (
self.config_dir, self._strongswan_piddir, self.config_dir),
('--rootwrap_config=%s' % self._rootwrap_cfg
if self._rootwrap_cfg else ''),
'--cmd=%s' % ','.join(cmd)],
check_exit_code=check_exit_code,
extra_ok_codes=extra_ok_codes)