Browse code

Merge "Remove old DEFAULT.root_helper setting"

Jenkins authored on 2014/01/26 01:45:48
Showing 1 changed files
... ...
@@ -610,9 +610,6 @@ function _configure_neutron_debug_command() {
610 610
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT verbose False
611 611
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT debug False
612 612
     iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
613
-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT root_helper "$Q_RR_COMMAND"
614
-    # Intermediate fix until Neutron patch lands and then line above will
615
-    # be cleaned.
616 613
     iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper "$Q_RR_COMMAND"
617 614
 
618 615
     _neutron_setup_interface_driver $NEUTRON_TEST_CONFIG_FILE