From 83e642a05a7c1085650a17e1bf41202559de59b0 Mon Sep 17 00:00:00 2001 From: willy lin Date: Mon, 10 Aug 2015 16:07:28 +0800 Subject: [PATCH] Change default of option volume_driver to LVMVolumeDriver message: "LVMISCSIDriver" change to "LVMVolumeDriver" Change-Id: I8f1a5bc63ba108f804e39289e2a201fbfb517b7e Closes-Bug: #1483081 --- .../blockstorage-driver-filter-weighing.rst | 6 +++--- .../source/blockstorage_multi_backend.rst | 16 ++++++++-------- ...ckstorage_ratelimit_volume_copy_bandwidth.rst | 4 ++-- .../blockstorage_volume_number_weigher.rst | 14 +++++++------- doc/common/samples/cinder.conf.sample | 2 +- .../block-storage/section_volume-drivers.xml | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/admin-guide-cloud/source/blockstorage-driver-filter-weighing.rst b/doc/admin-guide-cloud/source/blockstorage-driver-filter-weighing.rst index 24b2858c35..e00bbfbcdf 100644 --- a/doc/admin-guide-cloud/source/blockstorage-driver-filter-weighing.rst +++ b/doc/admin-guide-cloud/source/blockstorage-driver-filter-weighing.rst @@ -330,21 +330,21 @@ properties:: [lvm-1] volume_group = stack-volumes-lvmdriver-1 - volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver + volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver volume_backend_name = lvmdriver-1 filter_function = "volume.size < 5" goodness_function = "(capabilities.total_volumes < 3) ? 100 : 50" [lvm-2] volume_group = stack-volumes-lvmdriver-2 - volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver + volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver volume_backend_name = lvmdriver-2 filter_function = "volumes.size < 5" goodness_function = "(capabilities.total_volumes < 8) ? 100 : 50" [lvm-3] volume_group = stack-volumes-lvmdriver-3 - volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver + volume_driver = cinder.volume.drivers.LVMVolumeDriver volume_backend_name = lvmdriver-3 goodness_function = "55" diff --git a/doc/admin-guide-cloud/source/blockstorage_multi_backend.rst b/doc/admin-guide-cloud/source/blockstorage_multi_backend.rst index 7f517ac561..3f4a243016 100644 --- a/doc/admin-guide-cloud/source/blockstorage_multi_backend.rst +++ b/doc/admin-guide-cloud/source/blockstorage_multi_backend.rst @@ -18,7 +18,7 @@ In that case, the scheduler properly decides which back end the volume has to be created in. The name of the back end is declared as an extra-specification of a -volume type (such as, ``volume_backend_name=LVM_iSCSI``). When a volume +volume type (such as, ``volume_backend_name=LVM``). When a volume is created, the scheduler chooses an appropriate back end to handle the request, according to the volume type specified by the user. @@ -60,19 +60,19 @@ These examples show three back ends: enabled_backends=lvmdriver-1,lvmdriver-2,lvmdriver-3 [lvmdriver-1] volume_group=cinder-volumes-1 - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM [lvmdriver-2] volume_group=cinder-volumes-2 - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM [lvmdriver-3] volume_group=cinder-volumes-3 - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI_b + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM_b In this configuration, ``lvmdriver-1`` and ``lvmdriver-2`` have the same -``volume_backend_name``. If a volume creation requests the ``LVM_iSCSI`` +``volume_backend_name``. If a volume creation requests the ``LVM`` back end name, the scheduler uses the capacity filter scheduler to choose the most suitable driver, which is either ``lvmdriver-1`` or ``lvmdriver-2``. The capacity filter scheduler is enabled by default. The next section diff --git a/doc/admin-guide-cloud/source/blockstorage_ratelimit_volume_copy_bandwidth.rst b/doc/admin-guide-cloud/source/blockstorage_ratelimit_volume_copy_bandwidth.rst index f5b4c5a0d5..03c5b13ae1 100644 --- a/doc/admin-guide-cloud/source/blockstorage_ratelimit_volume_copy_bandwidth.rst +++ b/doc/admin-guide-cloud/source/blockstorage_ratelimit_volume_copy_bandwidth.rst @@ -33,8 +33,8 @@ of ``lvmdriver-1`` up to 100 MiB/s: [lvmdriver-1] volume_group=cinder-volumes-1 - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM volume_copy_bps_limit=104857600 .. note:: diff --git a/doc/admin-guide-cloud/source/blockstorage_volume_number_weigher.rst b/doc/admin-guide-cloud/source/blockstorage_volume_number_weigher.rst index d37c00f4e6..468a2b69f3 100644 --- a/doc/admin-guide-cloud/source/blockstorage_volume_number_weigher.rst +++ b/doc/admin-guide-cloud/source/blockstorage_volume_number_weigher.rst @@ -25,7 +25,7 @@ Configure multiple-storage back ends ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To configure ``VolumeNumberWeigher``, use ``LVMISCSIDriver`` +To configure ``VolumeNumberWeigher``, use ``LVMVolumeDriver`` as the volume driver. This configuration defines two LVM volume groups: ``stack-volumes`` with @@ -39,13 +39,13 @@ This example configuration defines two back ends: enabled_backends=lvmdriver-1,lvmdriver-2 [lvmdriver-1] volume_group=stack-volumes - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM [lvmdriver-2] volume_group=stack-volumes-1 - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver - volume_backend_name=LVM_iSCSI + volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name=LVM Volume type ~~~~~~~~~~~ @@ -56,10 +56,10 @@ Define a volume type in Block Storage:: Create an extra specification that links the volume type to a back-end name:: - $ cinder type-key lvm set volume_backend_name=LVM_iSCSI + $ cinder type-key lvm set volume_backend_name=LVM This example creates a lvm volume type with -``volume_backend_name=LVM_iSCSI`` as extra specifications. +``volume_backend_name=LVM`` as extra specifications. Usage ~~~~~ diff --git a/doc/common/samples/cinder.conf.sample b/doc/common/samples/cinder.conf.sample index 38744bac49..9ed1c208a7 100644 --- a/doc/common/samples/cinder.conf.sample +++ b/doc/common/samples/cinder.conf.sample @@ -2257,7 +2257,7 @@ # # Driver to use for volume creation (string value) -#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver +#volume_driver=cinder.volume.drivers.lvm.LVMVolumeDriver # Timeout for creating the volume to migrate to when # performing volume migration (seconds) (integer value) diff --git a/doc/config-reference/block-storage/section_volume-drivers.xml b/doc/config-reference/block-storage/section_volume-drivers.xml index e0082f4181..f4c60e8ffa 100644 --- a/doc/config-reference/block-storage/section_volume-drivers.xml +++ b/doc/config-reference/block-storage/section_volume-drivers.xml @@ -13,7 +13,7 @@ >https://git.openstack.org/cgit/openstack/cinder/). To set a volume driver, use the volume_driver flag. The default is: - volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver + volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver