From 37c63d60b44dc3bd90c52f608cdca10556551d8c Mon Sep 17 00:00:00 2001
From: vponomaryov <vponomaryov@mirantis.com>
Date: Thu, 23 Jan 2014 09:23:01 -0500
Subject: [PATCH] Use actual rootwrap option in manila.conf instead deprecated
 one

Change-Id: I0096e751cbf1b31944e8a7b15b46914dd79c340b
Closes-Bug: #1267547
---
 contrib/devstack/lib/manila | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/devstack/lib/manila b/contrib/devstack/lib/manila
index 09ebf11a34..d7f86a4228 100644
--- a/contrib/devstack/lib/manila
+++ b/contrib/devstack/lib/manila
@@ -182,7 +182,7 @@ function configure_manila() {
     iniset $MANILA_CONF DEFAULT iscsi_helper tgtadm
     iniset $MANILA_CONF DEFAULT sql_connection `database_connection_url manila`
     iniset $MANILA_CONF DEFAULT api_paste_config $MANILA_API_PASTE_INI
-    iniset $MANILA_CONF DEFAULT root_helper "sudo ${MANILA_ROOTWRAP}"
+    iniset $MANILA_CONF DEFAULT rootwrap_config $MANILA_CONF_DIR/rootwrap.conf
     iniset $MANILA_CONF DEFAULT osapi_share_extension manila.api.openstack.share.contrib.standard_extensions
     iniset $MANILA_CONF DEFAULT state_path $MANILA_STATE_PATH
     iniset $MANILA_CONF DEFAULT share_driver $SHARE_DRIVER