diff --git a/doc/common/tables/cinder-hitachi.xml b/doc/common/tables/cinder-hitachi-hbsd.xml
similarity index 100%
rename from doc/common/tables/cinder-hitachi.xml
rename to doc/common/tables/cinder-hitachi-hbsd.xml
diff --git a/doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml b/doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml
new file mode 100644
index 0000000000..732d35a32a
--- /dev/null
+++ b/doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml
@@ -0,0 +1,193 @@
+
+%openstack;
+]>
+
+ Hitachi storage volume driver
+ Hitachi storage volume driver provides iSCSI and Fibre Channel
+ support for Hitachi storages.
+
+ System requirements
+ Supported storages:
+
+
+ Hitachi Virtual Storage Platform G1000 (VSP G1000)
+
+
+ Hitachi Virtual Storage Platform (VSP)
+
+
+ Hitachi Unified Storage VM (HUS VM)
+
+
+ Hitachi Unified Storage 100 Family (HUS 100 Family)
+
+
+ Required software:
+
+
+ RAID Manager Ver 01-32-03/01 or later for VSP G1000/VSP/HUS VM
+
+
+ Hitachi Storage Navigator Modular 2 (HSNM2) Ver 27.50 or later for HUS 100 Family
+
+
+
+ HSNM2 needs to be installed under /usr/stonavm.
+
+ Required licenses:
+
+
+ Hitachi In-System Replication Software for VSP G1000/VSP/HUS VM
+
+
+ (Mandatory) ShadowImage in-system replication for HUS 100 Family
+
+
+ (Optional) Copy-on-Write Snapshot for HUS 100 Family
+
+
+ Additionaly, the pexpect package is required.
+
+
+ Supported operations
+
+
+ Create, delete, attach and detach volumes.
+
+
+ Create, list and delete volume snapshots.
+
+
+ Create a volume from a snapshot.
+
+
+ Copy a volume to an image.
+
+
+ Copy an image to a volume.
+
+
+ Clone a volume.
+
+
+ Extend a volume.
+
+
+ Get volume statistics.
+
+
+
+
+ Configuration
+
+ Set up Hitachi storage
+ You need to specify settings as described below. For details about each step, see the user's guide of the storage device. Use a storage administrative software such as Storage Navigator to set up the storage device so that LDEVs and host groups can be created and deleted, and LDEVs can be connected to the server and can be asynchronously copied.
+
+
+ Create a Dynamic Provisioning pool.
+
+
+ Connect the ports at the storage to the Controller node and Compute nodes.
+
+
+ For VSP G1000/VSP/HUS VM, set "port security" to "enable" for the ports at the storage.
+
+
+ For HUS 100 Family, set "Host Group security"/"iSCSI target security" to "ON" for the ports at the storage.
+
+
+ For the ports at the storage, create host groups (iSCSI targets) whose names begin with HBSD- for the Controller node and each Compute node. Then register a WWN (initiator IQN) for each of the Controller node and Compute nodes.
+
+
+ For VSP G1000/VSP/HUS VM, perform the following:
+
+
+ Create a storage device account belonging to the Administrator User Group.
+(To use multiple storage devices, create the same account name for all the target storage devices, and specify the same resource group and permissions.)
+
+
+ Create a command device (In-Band), and set user authentication to ON.
+
+
+ Register the created command device to the host group for the Controller node.
+
+
+ To use the Thin Image function, create a pool for Thin Image.
+
+
+
+
+ For HUS 100 Family, perform the following:
+
+
+ Use the command auunitaddauto to register the unit name and controller of the storage device to HSNM2.
+
+
+ When connecting via iSCSI, if you are using CHAP certification, specify the same user and password as that used for the storage port.
+
+
+
+
+
+
+ Set up Hitachi Gigabit Fibre Channel adaptor
+ Change a parameter of the hfcldd driver and update
+ the initram file if Hitachi Gigabit Fibre Channel
+ adaptor is used.
+ #/opt/hitachi/drivers/hba/hfcmgr -E hfc_rport_lu_scan 1
+#dracut -f initramfs-KERNEL_VERSION.img KERNEL_VERSION
+#reboot
+
+
+ Set up Hitachi storage volume driver
+
+
+ Create directory.
+ #mkdir /var/lock/hbsd
+#chown cinder:cinder /var/lock/hbsd
+
+
+ Create "volume type" and "volume key".
+ This example shows that HUS100_SAMPLE is created
+ as "volume type" and hus100_backend is registered
+ as "volume key".
+ $cinder type-create HUS100_SAMPLE
+$cinder type-key HUS100_SAMPLE set volume_backend_name=hus100_backend
+
+ Please specify any identical "volume type" name and "volume key".
+
+ To confirm the created "volume type", please
+ execute the following command:
+ $cinder extra-specs-list
+
+
+ Edit /etc/cinder/cinder.conf as follows.
+ If you use Fibre Channel:
+ volume_driver = cinder.volume.drivers.hitachi.hbsd_fc.HBSDFCDriver
+ If you use iSCSI:
+ volume_driver = cinder.volume.drivers.hitachi.hbsd_iscsi.HBSDISCSIDriver
+ Also, set created by cinder type-key
+ volume_backend_name = hus100_backend
+ This table shows configuration options for Hitachi storage volume driver.
+
+
+
+ Restart Block Storage service.
+
+ When the startup is done,
+ "MSGID0003-I: The storage backend can be used."
+ is output into /var/log/cinder/volume.log as follows.
+
+ 2014-09-01 10:34:14.169 28734 WARNING cinder.volume.drivers.hitachi.
+hbsd_common [req-a0bb70b5-7c3f-422a-a29e-6a55d6508135 None None]
+MSGID0003-I: The storage backend can be used. (config_group:
+hus100_backend)
+
+
+
+
+
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
index 6aac412af5..159fed706a 100644
--- a/doc/config-reference/block-storage/section_misc.xml
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -50,7 +50,6 @@
-
diff --git a/doc/config-reference/block-storage/section_volume-drivers.xml b/doc/config-reference/block-storage/section_volume-drivers.xml
index c45a8bee45..b03970d0f0 100644
--- a/doc/config-reference/block-storage/section_volume-drivers.xml
+++ b/doc/config-reference/block-storage/section_volume-drivers.xml
@@ -23,6 +23,7 @@
+
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index 1bdf7725f4..f4b2fe906a 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -106,27 +106,27 @@ gpfs_storage_pool storage_gpfs
hds_cinder_config_file hds-hus
hds_hnas_iscsi_config_file hds-hnas
hds_hnas_nfs_config_file hds-hnas
-hitachi_add_chap_user hitachi
-hitachi_async_copy_check_interval hitachi
-hitachi_auth_method hitachi
-hitachi_auth_password hitachi
-hitachi_auth_user hitachi
-hitachi_copy_check_interval hitachi
-hitachi_copy_speed hitachi
-hitachi_default_copy_method hitachi
-hitachi_group_range hitachi
-hitachi_group_request hitachi
-hitachi_horcm_add_conf hitachi
-hitachi_horcm_numbers hitachi
-hitachi_horcm_password hitachi
-hitachi_horcm_user hitachi
-hitachi_ldev_range hitachi
-hitachi_pool_id hitachi
-hitachi_serial_number hitachi
-hitachi_target_ports hitachi
-hitachi_thin_pool_id hitachi
-hitachi_unit_name hitachi
-hitachi_zoning_request hitachi
+hitachi_add_chap_user hitachi-hbsd
+hitachi_async_copy_check_interval hitachi-hbsd
+hitachi_auth_method hitachi-hbsd
+hitachi_auth_password hitachi-hbsd
+hitachi_auth_user hitachi-hbsd
+hitachi_copy_check_interval hitachi-hbsd
+hitachi_copy_speed hitachi-hbsd
+hitachi_default_copy_method hitachi-hbsd
+hitachi_group_range hitachi-hbsd
+hitachi_group_request hitachi-hbsd
+hitachi_horcm_add_conf hitachi-hbsd
+hitachi_horcm_numbers hitachi-hbsd
+hitachi_horcm_password hitachi-hbsd
+hitachi_horcm_user hitachi-hbsd
+hitachi_ldev_range hitachi-hbsd
+hitachi_pool_id hitachi-hbsd
+hitachi_serial_number hitachi-hbsd
+hitachi_target_ports hitachi-hbsd
+hitachi_thin_pool_id hitachi-hbsd
+hitachi_unit_name hitachi-hbsd
+hitachi_zoning_request hitachi-hbsd
host common
hp3par_api_url hp3par
hp3par_cpg hp3par
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 9c2ebd76e1..3a60ac09c7 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -11,7 +11,7 @@ fujitsu_eternus_dx Fujitsu ETERNUS DX volume driver
fusionio Fusion-io driver
hds-hnas HDS HNAS iSCSI and NFS driver
hds-hus HDS HUS iSCSI driver
-hitachi Hitachi volume driver
+hitachi-hbsd Hitachi storage volume driver
hp3par HP 3PAR Fibre Channel and iSCSI drivers
hplefthand HP LeftHand/StoreVirtual driver
hpmsa HP MSA Fiber Channel driver