commit 0c552fcc96683b2cdcbf249861c072e74fbfecd8
author Jenkins <jenkins@review.openstack.org> Fri Feb 22 12:16:43 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 22 12:16:43 2013 +0000
tree 0b72510879e27b8a9dde2cf225cf81cc981703a6
parent 91740dac21e58d2ff3d08df177b5c3f5c9c5e7ff
parent a58382acb6bffcd0c6cbc5e1d114f492606644dc

Merge "Update cinder to use rootwrap_config"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 4d1ab42..49db410 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -171,7 +171,7 @@
     database_connection_url dburl cinder
     iniset $CINDER_CONF DEFAULT sql_connection $dburl
     iniset $CINDER_CONF DEFAULT api_paste_config $CINDER_API_PASTE_INI
-    iniset $CINDER_CONF DEFAULT root_helper "sudo ${CINDER_ROOTWRAP}"
+    iniset $CINDER_CONF DEFAULT rootwrap_config "$CINDER_CONF_DIR/rootwrap.conf"
     iniset $CINDER_CONF DEFAULT osapi_volume_extension cinder.api.contrib.standard_extensions
     iniset $CINDER_CONF DEFAULT state_path $CINDER_STATE_PATH