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
openstack · Sep 13, 2013 · 37e775f · 37e775f
1 parent cd3c5cf
commit 37e775f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
@@ -22,7 +22,7 @@
 
 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 @@
 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
@@ -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
 
 
 #