From: John Griffith <john.griffith@solidfire.com>
Date: Tue, 19 Feb 2013 00:11:44 +0000 (-0700)
Subject: Set rootwrap_config in cinder.conf sample.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=187b349bd523661f1dff7dcf313de32e62ea31fe;p=openstack-build%2Fcinder-build.git

Set rootwrap_config in cinder.conf sample.

Remove the root_helper=sudo in cinder.conf.sample and
move to the rootwrap_config=/etc/cinder/rootwrap.conf as
the default.

Change-Id: Ib4bacf4d24993cb9506b51523a5ba44fe1f85d18
---

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index f5b0d0bb2..fe5bfa1ca 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -178,13 +178,9 @@
 # be hour, day, month or year (string value)
 #volume_usage_audit_period=month
 
-# Deprecated: command to use for running commands as root
-# (string value)
-#root_helper=sudo
-
 # Path to the rootwrap configuration file to use for running
 # commands as root (string value)
-#rootwrap_config=<None>
+#rootwrap_config=/etc/cinder/rootwrap.conf
 
 # Whether to log monkey patching (boolean value)
 #monkey_patch=false