commit dcbaf1ca6b43211ccf164064d57abd6e24057739
author Jenkins <jenkins@review.openstack.org> Wed Jan 30 18:06:52 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 30 18:06:52 2013 +0000
tree 702495ed36beca8f768b0aadf4d6f4cc962b0975
parent 43a5b481e83a59ea2c33a81cf1b4e5e9f59c0126
parent d9ca2b2fd657031f4d8ff84c0d137d2b9cabb8fb

Merge "Ensure that debug agent has root_helper in [AGENT] section"

lib/quantum

diff --git a/lib/quantum b/lib/quantum
index c5fc6e8..d5733b3 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -410,6 +410,9 @@
     iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT debug False
     iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
     iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT root_helper "$Q_RR_COMMAND"
+    # Intermediate fix until Quantum patch lands and then line above will
+    # be cleaned.
+    iniset $QUANTUM_TEST_CONFIG_FILE AGENT root_helper "$Q_RR_COMMAND"
 
     _quantum_setup_keystone $QUANTUM_TEST_CONFIG_FILE DEFAULT set_auth_url
     _quantum_setup_interface_driver $QUANTUM_TEST_CONFIG_FILE