Merge "Quantum root_helper update"

lib/quantum

@@ -472,9 +472,8 @@ function _configure_quantum_metadata_agent() {
 # _configure_quantum_plugin_agent() - Set config files for quantum plugin agent
 # It is called when q-agt is enabled.
 function _configure_quantum_plugin_agent() {
-
     # Specify the default root helper prior to agent configuration to
-    # ensure that an agent's configuration can override the default.
+    # ensure that an agent's configuration can override the default
     iniset /$Q_PLUGIN_CONF_FILE AGENT root_helper "$Q_RR_COMMAND"
 
     # Configure agent for plugin
@@ -544,6 +543,9 @@ function _quantum_setup_rootwrap() {
     chmod 0440 $TEMPFILE
     sudo chown root:root $TEMPFILE
     sudo mv $TEMPFILE /etc/sudoers.d/quantum-rootwrap
+
+    # Update the root_helper
+    iniset $QUANTUM_CONF AGENT root_helper "$Q_RR_COMMAND"
 }
 
 # Configures keystone integration for quantum service and agents