Browse code

Quantum root_helper update

We are currently moving root_helper to the [AGENT] section. This patch
is intended to enable the transition for that process.

Change-Id: Iff8144f74a1a5f8b0fc9af44bccf0213f4bfad7e

Gary Kotton authored on 2013/01/28 23:26:56
Showing 1 changed files
... ...
@@ -472,9 +472,8 @@ function _configure_quantum_metadata_agent() {
472 472
 # _configure_quantum_plugin_agent() - Set config files for quantum plugin agent
473 473
 # It is called when q-agt is enabled.
474 474
 function _configure_quantum_plugin_agent() {
475
-
476 475
     # Specify the default root helper prior to agent configuration to
477
-    # ensure that an agent's configuration can override the default.
476
+    # ensure that an agent's configuration can override the default
478 477
     iniset /$Q_PLUGIN_CONF_FILE AGENT root_helper "$Q_RR_COMMAND"
479 478
 
480 479
     # Configure agent for plugin
... ...
@@ -544,6 +543,9 @@ function _quantum_setup_rootwrap() {
544 544
     chmod 0440 $TEMPFILE
545 545
     sudo chown root:root $TEMPFILE
546 546
     sudo mv $TEMPFILE /etc/sudoers.d/quantum-rootwrap
547
+
548
+    # Update the root_helper
549
+    iniset $QUANTUM_CONF AGENT root_helper "$Q_RR_COMMAND"
547 550
 }
548 551
 
549 552
 # Configures keystone integration for quantum service and agents