Correct lvm_mirrors help message

The description is not correct if someone sets
lvm_mirrors=0.  Also clarify LVs vs. lvms.

Change-Id: I7ec74fc8beaef5e638bc1a5dac3d7d97f1c474d3

diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
index dc98a78703ca2579501d774f42dca257a45d49b7..bdfe12d2413c9b4d7808bddfabfc6e8af35fe2ae 100644 (file)
--- a/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@ -44,8 +44,8 @@ volume_opts = [
                help='Name for the VG that will contain exported volumes'),
     cfg.IntOpt('lvm_mirrors',
                default=0,
-               help='If set, create lvms with multiple mirrors. Note that '
-                    'this requires lvm_mirrors + 2 pvs with available space'),
+               help='If >0, create LVs with multiple mirrors. Note that '
+                    'this requires lvm_mirrors + 2 PVs with available space'),
     cfg.StrOpt('lvm_type',
                default='default',
                help='Type of LVM volumes to deploy; (default or thin)'),

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 018ea0a19307a62f4806649181b4cc205988ac8e..db893a3062778fd617c9a1108d14be15bcc036a5 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1290,8 +1290,8 @@
 # value)
 #volume_group=cinder-volumes
 
-# If set, create lvms with multiple mirrors. Note that this
-# requires lvm_mirrors + 2 pvs with available space (integer
+# If >0, create LVs with multiple mirrors. Note that this
+# requires lvm_mirrors + 2 PVs with available space (integer
 # value)
 #lvm_mirrors=0