Use $state_path/conversion for image_conversion_dir default

image_conversion_dir currently defaults to /tmp.  Using
$state_path/conversion seems to be a more appropriate default.

Closes-Bug: #1217552
Change-Id: Iaaa462449a257b1b48fc349399bf409d7301a1e6

diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
index dbfb7232c809505dddbb24c1bb9410181e4d30a2..c562a91da8e80012f58ad04dc9fbe5081c8bdca2 100644 (file)
--- a/cinder/image/image_utils.py
+++ b/cinder/image/image_utils.py
@@ -22,7 +22,7 @@ Helper methods to deal with images.
 
 This is essentially a copy from nova.virt.images.py
 Some slight modifications, but at some point
-we should look at maybe pushign this up to OSLO
+we should look at maybe pushing this up to Oslo
 """
 
 
@@ -44,8 +44,9 @@ from cinder.volume import utils as volume_utils
 LOG = logging.getLogger(__name__)
 
 image_helper_opt = [cfg.StrOpt('image_conversion_dir',
-                    default='/tmp',
-                    help='parent dir for tempdir used for image conversion'), ]
+                    default='$state_path/conversion',
+                    help='Directory used for temporary storage '
+                         'during image conversion'), ]
 
 CONF = cfg.CONF
 CONF.register_opts(image_helper_opt)

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 4fd56312af7d90d957ec315cb03651893cd6de3f..2d8f67d8d78965a7f077e8a99a14a31f0fa26007 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -537,9 +537,9 @@
 # Options defined in cinder.image.image_utils
 #
 
-# parent dir for tempdir used for image conversion (string
-# value)
-#image_conversion_dir=/tmp
+# Directory used for temporary storage during image conversion
+# (string value)
+#image_conversion_dir=$state_path/conversion
 
 
 #