From: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
Date: Tue, 22 Sep 2015 06:51:42 +0000 (-0700)
Subject: Fixes 'ovs-agent cannot start on Windows because root_helper opt is not found'
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cf1689438079de264dd4a61cccaf2ad8b0bd05b9;p=openstack-build%2Fneutron-build.git

Fixes 'ovs-agent cannot start on Windows because root_helper opt is not found'

Change Ie1224f8a1c17268cd7d1c474ed82fdfb8852eaa8 removed
config.register_root_helper() from ovs_neutron_agent:main, thus the agent
cannot start on Windows since root_helper config option is never
registered.

The fix consists in adding config.register_root_helper in the Windows side
utils.

Closes-Bug: #1497930

Change-Id: I6adc3b869c9564cac3ab99174b8fe47584213e59
(cherry picked from commit 074f82d3ec18fd591e9d1805676dfe13bd508510)
---

diff --git a/neutron/agent/common/utils.py b/neutron/agent/common/utils.py
index 2b50da217..a6255709b 100644
--- a/neutron/agent/common/utils.py
+++ b/neutron/agent/common/utils.py
@@ -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
diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py
index b3f7a0bd1..83e54ef0e 100644
--- a/neutron/agent/linux/utils.py
+++ b/neutron/agent/linux/utils.py
@@ -44,7 +44,6 @@ from neutron import wsgi
 
 
 LOG = logging.getLogger(__name__)
-config.register_root_helper(cfg.CONF)
 
 
 class RootwrapDaemonHelper(object):