Merge "LVM / Block Device Drivers: Fix duplicated flags"

savi-dev · Aug 1, 2013 · ba48af1 · ba48af1
2 parents 19e9a06 + 25cae8b
commit ba48af1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cinder/volume/drivers/block_device.py b/cinder/volume/drivers/block_device.py
@@ -43,6 +43,9 @@
                     'none, zero, shred)'),
 ]
 
+CONF = cfg.CONF
+CONF.register_opts(volume_opts)
+
 
 class BlockDeviceDriver(driver.ISCSIDriver):
     VERSION = '1.0'

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
@@ -42,13 +42,6 @@
     cfg.StrOpt('volume_group',
                default='cinder-volumes',
                help='Name for the VG that will contain exported volumes'),
-    cfg.StrOpt('volume_clear',
-               default='zero',
-               help='Method used to wipe old volumes (valid options are: '
-                    'none, zero, shred)'),
-    cfg.IntOpt('volume_clear_size',
-               default=0,
-               help='Size in MiB to wipe at start of old volumes. 0 => all'),
     cfg.StrOpt('pool_size',
                default=None,
                help='Size of thin provisioning pool '
@@ -61,6 +54,8 @@
 
 CONF = cfg.CONF
 CONF.register_opts(volume_opts)
+CONF.import_opt('volume_clear', 'cinder.volume.drivers.block_device')
+CONF.import_opt('volume_clear_size', 'cinder.volume.drivers.block_device')
 
 
 class LVMVolumeDriver(driver.VolumeDriver):