From e355e2b9d22d16c9d1daa0f8521b35209d091df7 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 3 Mar 2014 10:19:24 +0100 Subject: [PATCH] Fix screens in hp-3par-driver Fix every screen to use proper markup and wrap lines correctly. Also update programlisting to follow conventions. Change-Id: Ie122c12f7d6dfc52c6763955fd8c0b28270866a1 --- .../block-storage/drivers/hp-3par-driver.xml | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/doc/config-reference/block-storage/drivers/hp-3par-driver.xml b/doc/config-reference/block-storage/drivers/hp-3par-driver.xml index db103ea6ff..28fb65908b 100644 --- a/doc/config-reference/block-storage/drivers/hp-3par-driver.xml +++ b/doc/config-reference/block-storage/drivers/hp-3par-driver.xml @@ -109,8 +109,7 @@ For information about how to set the key-value pairs and associate them with a volume type, run the following command: - $ - cinder help type-key + $ cinder help type-key Volumes that are cloned only support extra specs @@ -193,7 +192,7 @@ Install the hp3parclient Python package on the OpenStack Block Storage system. - $sudo pip install hp3parclient + $ sudo pip install hp3parclient @@ -204,31 +203,38 @@ Log onto the HP 3PAR storage system with administrator - access.#ssh 3paradm@<HP 3PAR IP Address> + access. + $ ssh 3paradm@<HP 3PAR IP Address> View the current state of the Web - Services API Server. - #showwsapi-Service- -State- -HTTP_State- - HTTP_Port -HTTPS_State- HTTPS_Port -Version-Enabled Active Enabled 8008 - Enabled 8080 1.1 + Services API Server. + # showwsapi +-Service- -State- -HTTP_State- HTTP_Port -HTTPS_State- HTTPS_Port -Version- +Enabled Active Enabled 8008 Enabled 8080 1.1 If the Web Services API Server is disabled, start - it.#startwsapi + it. + + # startwsapi If the HTTP or HTTPS state is disabled, enable one of - them.#setwsapi -http enable or #setwsapi -https enable + them. + # setwsapi -http enable + or # setwsapi -https enable + + To stop the Web Services API Server, use the stopwsapi command. For other options run the setwsapi –h command. - + If you are not using an existing CPG, create a @@ -239,54 +245,53 @@ Make the following changes in the /etc/cinder/cinder.conf file. - - ## REQUIRED SETTINGS + ## REQUIRED SETTINGS # 3PAR WS API Server URL - hp3par_api_url=https://10.10.0.141:8080/api/v1 +hp3par_api_url=https://10.10.0.141:8080/api/v1 # 3PAR Super user username - hp3par_username=3paradm +hp3par_username=3paradm # 3PAR Super user password - hp3par_password=3parpass +hp3par_password=3parpass # 3PAR CPG to use for volume creation - hp3par_cpg=OpenStackCPG_RAID5_NL +hp3par_cpg=OpenStackCPG_RAID5_NL # IP address of SAN controller for SSH access to the array - san_ip=10.10.22.241 +san_ip=10.10.22.241 # Username for SAN controller for SSH access to the array - san_login=3paradm +san_login=3paradm # Password for SAN controller for SSH access to the array - san_password=3parpass +san_password=3parpass # FIBRE CHANNEL(uncomment the next line to enable the FC driver) - # volume_driver=cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver +# volume_driver=cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver # iSCSI (uncomment the next line to enable the iSCSI driver and # hp3par_iscsi_ips or iscsi_ip_address) - #volume_driver=cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver +#volume_driver=cinder.volume.drivers.san.hp.hp_3par_iscsi.HP3PARISCSIDriver # iSCSI multiple port configuration - # hp3par_iscsi_ips=10.10.220.253:3261,10.10.222.234 +# hp3par_iscsi_ips=10.10.220.253:3261,10.10.222.234 # Still available for single port iSCSI configuration - #iscsi_ip_address=10.10.220.253 - ## OPTIONAL SETTINGS +#iscsi_ip_address=10.10.220.253 + +## OPTIONAL SETTINGS # Enable HTTP debugging to 3PAR - hp3par_debug=False +hp3par_debug=False # The CPG to use for Snapshots for volumes. If empty hp3par_cpg will be used. - hp3par_snap_cpg=OpenStackSNAP_CPG +hp3par_snap_cpg=OpenStackSNAP_CPG # Time in hours to retain a snapshot. You can't delete it before this expires. - hp3par_snapshot_retention=48 +hp3par_snapshot_retention=48 # Time in hours when a snapshot expires and is deleted. This must be larger than retention. - hp3par_snapshot_expiration=72 - +hp3par_snapshot_expiration=72 You can enable only one driver on each cinder instance unless you enable multiple