From 92c0c8f8144eeacf0f25b75dca06d003efa7de3a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 21 Sep 2013 09:47:17 +0200 Subject: [PATCH] Use cinder autogenerated tables for drivers Change-Id: I471df2a41ec3c8f642bcb758de4e39148d937736 --- .../drivers/glusterfs-driver.xml | 86 +---- .../drivers/nexenta-volume-driver.xml | 309 +----------------- .../drivers/nfs-volume-driver.xml | 91 +----- 3 files changed, 25 insertions(+), 461 deletions(-) diff --git a/doc/config-reference/block-storage/drivers/glusterfs-driver.xml b/doc/config-reference/block-storage/drivers/glusterfs-driver.xml index e85fe32e23..5d20fa2b6d 100644 --- a/doc/config-reference/block-storage/drivers/glusterfs-driver.xml +++ b/doc/config-reference/block-storage/drivers/glusterfs-driver.xml @@ -25,87 +25,7 @@ volume_driver=cinder.volume.drivers.glusterfs.GlusterfsDriver - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
List of configuration flags for GlusterFS
Flag NameTypeDefaultDescription
- - glusterfs_shares_config - - Mandatory - - File with the list of available gluster - shares. - -
- - glusterfs_mount_point_base - - Optional - - $state_path/mnt - - - - Base dir where gluster expected to be mounted. - -
- - glusterfs_disk_util - - Optionaldf - - Use du or - df - for free space calculation. - -
- - glusterfs_sparsed_volumes - - OptionalTrue - Create volumes as sparsed files which take - no space. If set to - False, volume is created using - "dd" or a similar - command to create the full-sized file, so - volume creation takes a greater amount of - time.
+ The following table contains the configuration options + supported by the GlusterFS driver. + diff --git a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml index 3d33c65d4e..06e4c386f9 100644 --- a/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml +++ b/doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml @@ -60,179 +60,13 @@ The following table contains the options supported by the Nexenta iSCSI driver. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- List of configuration flags for Nexenta iSCSI driver -
Flag NameTypeDefaultDescription
- nexenta_rest_protocol - Optionalauto - - (StrOpt) NMS protocol can be set to - http or https, but - the default is auto which makes - the driver try to use HTTP and switch to HTTPS - in case of failure. - -
nexenta_hostMandatory - - (StrOpt) Hostname or IP of your NexentaStor - appliance. - -
nexenta_rest_portOptional2000 - - (IntOpt) The port where Nexenta listens for - REST requests (the same port where the NMV - works). - -
nexenta_userOptionaladmin - - (StrOpt) Username of the NMS user with all - necessary privileges on the appliance, - including the access to REST API. - -
nexenta_passwordOptionalnexenta - - (StrOpt) Password of the NMS user with all - necessary privileges on the appliance, - including the access to REST API. - -
nexenta_volumeOptionalcinder - - (StrOpt) Name of the volume on the NexentaStor - appliance that you would like to use in - Compute, this volume must exist on appliance. - -
- nexenta_target_prefix - Optionaliqn.1986-03.com.sun:02:cinder- - - (StrOpt) The prefix that is prepended to volume - id to form the iSCSI target name. The target - prefix does not change the name of the ZVol on - the selected NexentaStor appliance, just the - name that is exported. - -
- - nexenta_target_group_prefix - - Optionalcinder/ - - (StrOpt) The prefix for iSCSI target groups. - -
- - nexenta_iscsi_target_portal_port - - Optional3260 - - (IntOpt) The port to connect to NexentaStor - appliance over iSCSI. - -
nexenta_blocksizeOptional8KB - - (StrOpt) The size of the blocks in newly - created zvols on appliance, with the suffix; - for example, the default 8K means 8 kilobytes. - -
nexenta_sparseOptionalTrue - - (BoolOpt) Use sparse zvols. Sparse zvols do not - pre-allocate disk space before content is - actually written. - -
+ To use Compute with the Nexenta iSCSI driver, first set the volume_driver: - - - volume_driver= - cinder.volume.drivers.nexenta.volume.NexentaDriver - - + volume_driver=cinder.volume.drivers.nexenta.volume.NexentaDriver + Then set value for nexenta_host and other parameters from table if needed. @@ -271,136 +105,14 @@ To use Compute with the Nexenta NFS driver, first set the volume_driver: - - - volume_driver= - cinder.volume.drivers.nexenta.nfs.NexentaNfsDriver - - + +volume_driver = cinder.volume.drivers.nexenta.nfs.NexentaNfsDriver + The following table contains the options supported by the Nexenta NFS driver. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- List of configuration flags for Nexenta NFS driver -
Flag NameTypeDefaultDescription
- - nexenta_shares_config - - Mandatory - - /etc/cinder/nfs_shares - - - - (StrOpt) File with the list of available NFS - shares. - -
- nexenta_mount_point_base - Optional$state_path/mnt - - (StrOpt) Base dir where NFS shares are expected - to be mounted. - -
- nexenta_sparsed_volumes - OptionalTrue - - (BoolOpt) Create volumes as sparsed files which - take no space. If set to False, volume is - created as regular file. In such case volume - creation takes a lot of time. - -
- - nexenta_volume_compression - - Optionalon - - (StrOpt) ZFS compression value for new volumes. - -
- nexenta_mount_options - OptionalNone - - (StrOpt) Mount options passed to the NFS client. - See section of the nfs man page for details. - -
nexenta_used_ratioOptional0.95 - - (FloatOpt) Percent of ACTUAL usage of the - underlying volume before no new volumes can be - allocated to the volume destination. - -
- nexenta_oversub_ratio - Optional1.0 - - (FloatOpt) This compares the allocated to - available space on the volume destination. If - the ratio exceeds this number, the destination - is no longer valid. - -
+ Add your list of Nexenta NFS servers to the file you specified with the nexenta_shares_config option. For @@ -409,10 +121,9 @@ # cat /etc/cinder/nfs_shares -192.168.1.200:/storage http://admin:nexenta@192.168.1.200:2000 -192.168.1.201:/storage http://admin:nexenta@192.168.1.201:2000 -192.168.1.202:/storage http://admin:nexenta@192.168.1.202:2000 - +192.168.1.200:/storage http://admin:nexenta@192.168.1.200:2000 +192.168.1.201:/storage http://admin:nexenta@192.168.1.201:2000 +192.168.1.202:/storage http://admin:nexenta@192.168.1.202:2000 Comments are allowed in this file. They begin with a #. diff --git a/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml b/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml index 435e7088ed..1f5cb97948 100644 --- a/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml +++ b/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml @@ -30,74 +30,7 @@ volume_driver=cinder.volume.drivers.nfs.NfsDriver The following table contains the options supported by the NFS driver. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
List of configuration flags for NFS
Flag NameTypeDefaultDescription
nfs_shares_configMandatory(StrOpt) File with the list of available - NFS shares.
nfs_mount_point_baseOptional$state_path/mnt(StrOpt) Base dir where nfs shares are - expected to be mounted.
nfs_sparsed_volumesOptionalTrue(BoolOpt) Create volumes as sparsed - files which take no space. If set to - False, volume is created as regular file. - In such case volume creation takes a lot - of time.
nfs_mount_optionsOptionalNone(StrOpt) Mount options passed to the nfs - client. See section of the nfs man page - for details.
nfs_used_ratioOptional0.95(FloatOpt) Percent of ACTUAL usage of - the underlying volume before no new - volumes can be allocated to the volume - destination.
nfs_oversub_ratioOptional1.0(FloatOpt) This compares the allocated - to available space on the volume - destination. If the ratio exceeds this - number, the destination is no longer - valid.
+
How to Use the NFS Driver @@ -130,10 +63,10 @@ For example, if the value of this option was set to /etc/cinder/shares.txt, then: - # cat /etc/cinder/shares.txt - 192.168.1.200:/storage - 192.168.1.201:/storage - 192.168.1.202:/storage + # cat /etc/cinder/shares.txt +192.168.1.200:/storage +192.168.1.201:/storage +192.168.1.202:/storage Comments are allowed in this file. They begin with a #. @@ -155,17 +88,17 @@ now contain a directory for each NFS share specified in shares.txt. The name of each directory is a hashed name: - # ls /var/lib/cinder/nfs - ... - 46c5db75dc3a3a50a10bfd1a456a9f3f - ... + # ls /var/lib/cinder/nfs/ +... +46c5db75dc3a3a50a10bfd1a456a9f3f +... You can now create volumes as you normally would: - # nova volume-create --display-name=myvol 5 - # ls /var/lib/cinder/nfs/46c5db75dc3a3a50a10bfd1a456a9f3f - volume-a8862558-e6d6-4648-b5df-bb84f31c8935 + # nova volume-create --display-name=myvol 5 +# ls /var/lib/cinder/nfs/46c5db75dc3a3a50a10bfd1a456a9f3f +volume-a8862558-e6d6-4648-b5df-bb84f31c8935 This volume can also be attached and deleted just like other volumes. However, snapshotting is not supported.