summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gessau <gessau@cisco.com>2015-04-27 09:59:21 -0400
committerHenry Gessau <gessau@cisco.com>2015-04-28 02:49:11 +0000
commit7260e0e3fc2ea479e80e0962624aca7fd38a1f60 (patch)
tree76be0ff9ddc1fddf89e1afa7fbf55b04f5084122
parentd37e566dcadf8a540eb5f84b668847fa192393a1 (diff)
downloadneutron-7260e0e3fc2ea479e80e0962624aca7fd38a1f60.tar.gz
Run radvd as root2015.1.0rc32015.1.0
During the refactoring of external process management radvd lost its root privileges. Closes-bug: 1448813 Change-Id: I84883fe81684afafac9b024282a03f447c8f825a (cherry picked from commit a5e54338770fc074e01fa88dbf909ee1af1b66b2)
-rw-r--r--neutron/agent/linux/ra.py3
-rw-r--r--neutron/tests/unit/agent/l3/test_agent.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/neutron/agent/linux/ra.py b/neutron/agent/linux/ra.py
index 7f800c2696..d9eca8d647 100644
--- a/neutron/agent/linux/ra.py
+++ b/neutron/agent/linux/ra.py
@@ -103,7 +103,8 @@ class DaemonMonitor(object):
default_cmd_callback=callback,
namespace=self._router_ns,
service=RADVD_SERVICE_NAME,
- conf=cfg.CONF)
+ conf=cfg.CONF,
+ run_as_root=True)
def _spawn_radvd(self, radvd_conf):
def callback(pid_file):
diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py
index 4c6682bd8a..a5016f815f 100644
--- a/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@ -1399,7 +1399,8 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
service=process,
default_cmd_callback=mock.ANY,
namespace=ri.ns_name,
- conf=mock.ANY)]
+ conf=mock.ANY,
+ run_as_root=True)]
def _process_router_ipv6_subnet_added(
self, router, ipv6_subnet_modes=None):