openstack/neutron
Code Issues Proposed changes

Merge "Fixes 'ovs-agent cannot start on Windows because root_helper opt is not found'" into stable/liberty

Browse Source
This commit is contained in:
Jenkins
2015-10-02 19:56:33 +00:00
committed by Gerrit Code Review
parent a6818feef2 cf16894380
commit 19c6c0a64c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/common/utils.py
View File

@@ -15,9 +15,11 @@
import os
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils
from neutron.agent.common import config
from neutron.i18n import _LE
@@ -28,6 +30,7 @@ else:
LOG = logging.getLogger(__name__)
config.register_root_helper(cfg.CONF)
execute = utils.execute

1
neutron/agent/linux/utils.py
View File

@@ -44,7 +44,6 @@ from neutron import wsgi
LOG = logging.getLogger(__name__)
config.register_root_helper(cfg.CONF)
class RootwrapDaemonHelper(object):