diff --git a/doc/common/tables/cinder-hds.xml b/doc/common/tables/cinder-hds-hus.xml similarity index 86% rename from doc/common/tables/cinder-hds.xml rename to doc/common/tables/cinder-hds-hus.xml index dfc7949bf1..509fb69a93 100644 --- a/doc/common/tables/cinder-hds.xml +++ b/doc/common/tables/cinder-hds-hus.xml @@ -4,8 +4,8 @@ The tool to do so lives in the tools directory of this repository --> - - +
Description of configuration options for hds
+ diff --git a/doc/config-reference/block-storage/drivers/hds-volume-driver.xml b/doc/config-reference/block-storage/drivers/hds-hus-driver.xml similarity index 84% rename from doc/config-reference/block-storage/drivers/hds-volume-driver.xml rename to doc/config-reference/block-storage/drivers/hds-hus-driver.xml index 035fdb1278..95d5af0622 100644 --- a/doc/config-reference/block-storage/drivers/hds-volume-driver.xml +++ b/doc/config-reference/block-storage/drivers/hds-hus-driver.xml @@ -8,8 +8,8 @@ xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - HDS iSCSI volume driver - This Cinder volume driver provides iSCSI support for HDS HUS iSCSI driver + This Block Storage volume driver provides iSCSI support for HUS (Hitachi Unified Storage) arrays such as, HUS-110, HUS-130, and HUS-150. @@ -19,11 +19,11 @@ communicate with an HUS array. You can download this utility package from the HDS support site (https://HDSSupport.hds.com. + >https://HDSSupport.hds.com).Platform: Ubuntu 12.04LTS or newer.
- Supported Cinder operations + Supported operations These operations are supported: @@ -60,23 +60,18 @@ Create volume from snapshot - get_volume_stats + Get statistics - Thin provisioning, also known as Hitachi Dynamic Pool - (HDP), is supported for volume or snapshot creation. - Cinder volumes and snapshots do not have to reside in the - same pool.
Configuration The HDS driver supports the concept of differentiated - services, where volume type can be associated with the - fine-tuned performance characteristics of HDP—the - the dynamic pool where volumes shall be created + services, where a volume type can be associated with the + fine-tuned performance characteristics of an HDP— + the dynamic pool where volumes are created Do not confuse differentiated services with the - Cinder volume service. + OpenStack Block Storage volume services. . For instance, an HDP can consist of fast SSDs to provide speed. HDP can provide a certain reliability based on things like its RAID level characteristics. HDS @@ -93,23 +88,28 @@ back-end and for multi-back-end cases. - It is not recommended to manage a HUS array - simultaneously from multiple Cinder instances + It is not recommended to manage an HUS array + simultaneously from multiple OpenStack Block Storage instances or servers. It is okay to manage multiple HUS - arrays by using multiple Cinder + arrays by using multiple OpenStack Block Storage instances (or servers). - + + + HUS setup + Before using iSCSI services, use the HUS UI to create an + iSCSI domain for each EVS providing iSCSI services. + Single back-end - In a single back-end deployment, only one Cinder - instance runs on the Cinder server and controls one - HUS array: this setup requires these configuration + In a single back-end deployment, only one OpenStack Block Storage + instance runs on the OpenStack Block Storage server and controls one + HUS array: this deployment requires these configuration files: @@ -120,8 +120,8 @@ file to use the HDS volume driver. This option points to a configuration file. - The configuration file location is - not fixed. + The configuration file location + may differ. volume_driver = cinder.volume.drivers.hds.hds.HUSDriver hds_cinder_config_file = /opt/hds/hus/cinder_hds_conf.xml @@ -134,31 +134,32 @@ hds_cinder_config_file = /opt/hds/hus/cinder_hds_conf.xml /opt/hds/hus/cinder_hds_conf.xml: <?xml version="1.0" encoding="UTF-8" ?> <config> -<mgmt_ip0>172.17.44.16</mgmt_ip0> -<mgmt_ip1>172.17.44.17</mgmt_ip1> -<username>system</username> -<password>manager</password> -<svc_0> -<volume_type>default</volume_type> -<iscsi_ip>172.17.39.132</iscsi_ip> -<hdp>9</hdp> -</svc_0> -<snapshot> -<hdp>13</hdp> -</snapshot> -<lun_start> -3000 -</lun_start> -<lun_end> -4000 -</lun_end> + <mgmt_ip0>172.17.44.16</mgmt_ip0> + <mgmt_ip1>172.17.44.17</mgmt_ip1> + <hus_cmd>hus-cmd</hus_cmd> + <username>system</username> + <password>manager</password> + <svc_0> + <volume_type>default</volume_type> + <iscsi_ip>172.17.39.132</iscsi_ip> + <hdp>9</hdp> + </svc_0> + <snapshot> + <hdp>13</hdp> + </snapshot> + <lun_start> + 3000 + </lun_start> + <lun_end> + 4000 + </lun_end> </config> Multi back-end - In a multi back-end deployment, more than one Cinder + In a multi back-end deployment, more than one OpenStack Block Storage instance runs on the same server. In this example, two HUS arrays are used, possibly providing different storage performance: @@ -176,10 +177,12 @@ hds_cinder_config_file = /opt/hds/hus/cinder_hds_conf.xml each back-end to cinder.volume.drivers.hds.hds.HUSDriver enabled_backends=hus1,hus2 + [hus1] volume_driver = cinder.volume.drivers.hds.hds.HUSDriver hds_cinder_config_file = /opt/hds/hus/cinder_hus1_conf.xml volume_backend_name=hus-1 + [hus2] volume_driver = cinder.volume.drivers.hds.hds.HUSDriver hds_cinder_config_file = /opt/hds/hus/cinder_hus2_conf.xml @@ -190,24 +193,25 @@ volume_backend_name=hus-2 /opt/hds/hus/cinder_hus1_conf.xml: <?xml version="1.0" encoding="UTF-8" ?> <config> -<mgmt_ip0>172.17.44.16</mgmt_ip0> -<mgmt_ip1>172.17.44.17</mgmt_ip1> -<username>system</username> -<password>manager</password> -<svc_0> -<volume_type>regular</volume_type> -<iscsi_ip>172.17.39.132</iscsi_ip> -<hdp>9</hdp> -</svc_0> -<snapshot> -<hdp>13</hdp> -</snapshot> -<lun_start> -3000 -</lun_start> -<lun_end> -4000 -</lun_end> + <mgmt_ip0>172.17.44.16</mgmt_ip0> + <mgmt_ip1>172.17.44.17</mgmt_ip1> + <hus_cmd>hus-cmd</hus_cmd> + <username>system</username> + <password>manager</password> + <svc_0> + <volume_type>regular</volume_type> + <iscsi_ip>172.17.39.132</iscsi_ip> + <hdp>9</hdp> + </svc_0> + <snapshot> + <hdp>13</hdp> + </snapshot> + <lun_start> + 3000 + </lun_start> + <lun_end> + 4000 + </lun_end> </config> @@ -216,24 +220,25 @@ volume_backend_name=hus-2 file: <?xml version="1.0" encoding="UTF-8" ?> <config> -<mgmt_ip0>172.17.44.20</mgmt_ip0> -<mgmt_ip1>172.17.44.21</mgmt_ip1> -<username>system</username> -<password>manager</password> -<svc_0> -<volume_type>platinum</volume_type> -<iscsi_ip>172.17.30.130</iscsi_ip> -<hdp>2</hdp> -</svc_0> -<snapshot> -<hdp>3</hdp> -</snapshot> -<lun_start> -2000 -</lun_start> -<lun_end> -3000 -</lun_end> + <mgmt_ip0>172.17.44.20</mgmt_ip0> + <mgmt_ip1>172.17.44.21</mgmt_ip1> + <hus_cmd>hus-cmd</hus_cmd> + <username>system</username> + <password>manager</password> + <svc_0> + <volume_type>platinum</volume_type> + <iscsi_ip>172.17.30.130</iscsi_ip> + <hdp>2</hdp> + </svc_0> + <snapshot> + <hdp>3</hdp> + </snapshot> + <lun_start> + 2000 + </lun_start> + <lun_end> + 3000 + </lun_end> </config> @@ -253,9 +258,9 @@ cinder type-key platinum set volume_backend_name=hus-2 Non differentiated deployment of HUS arrays - You can deploy multiple Cinder instances that each + You can deploy multiple OpenStack Block Storage instances that each control a separate HUS array. Each instance has no - volume type associated with it. The Cinder filtering + volume type associated with it. The OpenStack Block Storage filtering algorithm selects the HUS array with the largest available free space. In each configuration file, you must define the default @@ -295,13 +300,13 @@ cinder type-key platinum set volume_backend_name=hus-2 An iSCSI port dedicated to the service. - Typically a Cinder volume instance has only one such + Typically a OpenStack Block Storage volume instance has only one such service label. For example, any svc_0, svc_1, svc_2, or svc_3 can be associated with it. But any mix of these service labels can be used in the same instance - get_volume_stats() always provides the available + The get_volume_stats() always provides the available capacity based on the combined sum of all the HDPs that are used in these services labels. . @@ -336,6 +341,18 @@ cinder type-key platinum set volume_backend_name=hus-2
+ + + + + + diff --git a/doc/config-reference/block-storage/section_volume-drivers.xml b/doc/config-reference/block-storage/section_volume-drivers.xml index 4374f1196a..443323881e 100644 --- a/doc/config-reference/block-storage/section_volume-drivers.xml +++ b/doc/config-reference/block-storage/section_volume-drivers.xml @@ -19,7 +19,7 @@ - + diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 905c3ce841..2f3d773d41 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -85,7 +85,7 @@ gpfs_max_clone_depth storage_gpfs gpfs_mount_point_base storage_gpfs gpfs_sparse_volumes storage_gpfs gpfs_storage_pool storage_gpfs -hds_cinder_config_file hds +hds_cinder_config_file hds-hus host common hp3par_api_url hp3par hp3par_cpg hp3par
Description of configuration options for hds-hus
Management Port 1 IP address
+ Optional + is the command used to + communicate with the HUS array. If it is not + set, the default value is + hus-cmd. +