From 98e18e99d18a1a294fb2a7f3dceb48bd81520c03 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 28 Jan 2013 14:26:56 +0000 Subject: [PATCH] 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 --- lib/quantum | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/quantum b/lib/quantum index 27b3509fb0..c5fc6e81f2 100644 --- a/lib/quantum +++ b/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