re-add broken code

2 files changed, 16 insertions, 4 deletions

diff --git a/nova/volume/driver.py b/nova/volume/driver.py
index 6d86f193f..15b6b550b 100644
--- a/nova/volume/driver.py
+++ b/nova/volume/driver.py
@@ -93,7 +93,10 @@ class VolumeDriver(object):
     def create_volume(self, volume):
         """Creates a logical volume. Can optionally return a Dictionary of
         changes to the volume object to be persisted."""
-        sizestr = '%sG' % volume['size']
+        if int(volume['size']) == 0:
+            sizestr = '100M'
+        else:
+            sizestr = '%sG' % volume['size']
         self._try_execute('sudo', 'lvcreate', '-L', sizestr, '-n',
                            volume['name'],
                            FLAGS.volume_group)
@@ -599,7 +602,10 @@ class SheepdogDriver(VolumeDriver):
 
     def create_volume(self, volume):
         """Creates a sheepdog volume"""
-        sizestr = '%sG' % volume['size']
+        if int(volume['size']) == 0:
+            sizestr = '100M'
+        else:
+            sizestr = '%sG' % volume['size']
         self._try_execute('qemu-img', 'create',
                           "sheepdog:%s" % volume['name'],
                           sizestr)
diff --git a/nova/volume/san.py b/nova/volume/san.py
index dd332de1a..9532c8116 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -219,7 +219,10 @@ class SolarisISCSIDriver(SanISCSIDriver):
 
     def create_volume(self, volume):
         """Creates a volume."""
-        sizestr = '%sG' % volume['size']
+        if int(volume['size']) == 0:
+            sizestr = '100M'
+        else:
+            sizestr = '%sG' % volume['size']
 
         zfs_poolname = self._build_zfs_poolname(volume)
 
@@ -486,7 +489,10 @@ class HpSanISCSIDriver(SanISCSIDriver):
         #TODO(justinsb): Should we default to inheriting thinProvision?
         cliq_args['thinProvision'] = '1' if FLAGS.san_thin_provision else '0'
         cliq_args['volumeName'] = volume['name']
-        cliq_args['size'] = '%sGB' % volume['size']
+        if int(volume['size']) == 0:
+            cliq_args['size'] = '100MB'
+        else:
+            cliq_args['size'] = '%sGB' % volume['size']
 
         self._cliq_run_xml("createVolume", cliq_args)