commit e9d4079e4ea687b41da7b2841fb6919457cfda6e
author Jenkins <jenkins@review.openstack.org> Sat Jan 25 16:45:48 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jan 25 16:45:48 2014 +0000
tree 186fc7ae4b13eea03a4cb23be91400400c120ed1
parent 6f31d76ef3336aec2e08eaa6656344107f2ff4ba
parent 14daa57d67fed6dc98b833f4c3698fef8ff7f312

Merge "Remove old DEFAULT.root_helper setting"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index af92d54..960f11b 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -610,9 +610,6 @@
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT verbose False
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT debug False
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT root_helper "$Q_RR_COMMAND"
-    # Intermediate fix until Neutron patch lands and then line above will
-    # be cleaned.
     iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper "$Q_RR_COMMAND"
 
     _neutron_setup_interface_driver $NEUTRON_TEST_CONFIG_FILE