diff --git a/doc/common/tables/cinder-ibmnas.xml b/doc/common/tables/cinder-ibmnas.xml index e3d9c4b15a..57ed125dc7 100644 --- a/doc/common/tables/cinder-ibmnas.xml +++ b/doc/common/tables/cinder-ibmnas.xml @@ -4,7 +4,7 @@ generated and your changes will be overwritten. The tool to do so lives in openstack-doc-tools repository. --> - + @@ -21,6 +21,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of IBM NAS volume driver configuration optionsDescription of IBM SONAS and Storwise V7000 volume driver configuration options
= v7ku (StrOpt) IBMNAS platform type to be used as backend storage; valid values are - v7ku : for using IBM Storwize V7000 Unified, sonas : for using IBM Scale Out NAS, gpfs-nas : for using NFS based IBM GPFS deployments.
= (StrOpt) IP address or Hostname of NAS system.
= admin(StrOpt) User name to connect to NAS system.
= None(StrOpt) Options used to mount the storage backend file system where Cinder volumes are stored.
= (StrOpt) Password to connect to NAS system.
= (StrOpt) Filename of private key to use for SSH authentication.
= auto(StrOpt) Allow network-attached storage systems to operate in a secure environment where root level access is not permitted. If set to False, access is as the root user and insecure. If set to True, access is not as root. If set to auto, a check is done to determine if this is a new installation: True is used if so, otherwise False. Default is auto.
= auto(StrOpt) Set more secure file permissions on network-attached storage volume files to restrict broad other/world access. If set to False, volumes are created with open permissions. If set to True, volumes are created with permissions for the cinder user and group (660). If set to auto, a check is done to determine if this is a new installation: True is used if so, otherwise False. Default is auto.
= (StrOpt) Path to the share to use for storing Cinder volumes. For example: "/srv/export1" for an NFS server export available at 10.0.5.10:/srv/export1 .
= 22(IntOpt) SSH port to use to connect to NAS system.
diff --git a/doc/common/tables/cinder-nas.xml b/doc/common/tables/cinder-nas.xml deleted file mode 100644 index e6fa9c7e60..0000000000 --- a/doc/common/tables/cinder-nas.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of NAS configuration options
Configuration option = Default valueDescription
[DEFAULT]
= (StrOpt) IP address or Hostname of NAS system.
= admin(StrOpt) User name to connect to NAS system.
= None(StrOpt) Options used to mount the storage backend file system where Cinder volumes are stored.
= (StrOpt) Password to connect to NAS system.
= (StrOpt) Filename of private key to use for SSH authentication.
= auto(StrOpt) Allow network-attached storage systems to operate in a secure environment where root level access is not permitted. If set to False, access is as the root user and insecure. If set to True, access is not as root. If set to auto, a check is done to determine if this is a new installation: True is used if so, otherwise False. Default is auto.
= auto(StrOpt) Set more secure file permissions on network-attached storage volume files to restrict broad other/world access. If set to False, volumes are created with open permissions. If set to True, volumes are created with permissions for the cinder user and group (660). If set to auto, a check is done to determine if this is a new installation: True is used if so, otherwise False. Default is auto.
= (StrOpt) Path to the share to use for storing Cinder volumes. For example: "/srv/export1" for an NFS server export available at 10.0.5.10:/srv/export1 .
= 22(IntOpt) SSH port to use to connect to NAS system.
- diff --git a/doc/config-reference/block-storage/drivers/ibm-sonas-7k-driver.xml b/doc/config-reference/block-storage/drivers/ibm-sonas-7k-driver.xml new file mode 100644 index 0000000000..bfb0c918b4 --- /dev/null +++ b/doc/config-reference/block-storage/drivers/ibm-sonas-7k-driver.xml @@ -0,0 +1,16 @@ +
+ IBM SONAS and Storwise V7000 volume driver + + The IBM Storage Driver for OpenStack is a Block Storage driver + that supports IBM SONAS and V7000 storage systems over NFS. + + + Set the following in your cinder.conf, and + use the table of options to configure it. + + volume_driver = cinder.volume.drivers.ibm.ibmnas + +
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml index 52232693a5..9d78b89c94 100644 --- a/doc/config-reference/block-storage/section_misc.xml +++ b/doc/config-reference/block-storage/section_misc.xml @@ -36,13 +36,11 @@ - - diff --git a/doc/config-reference/block-storage/section_volume-drivers.xml b/doc/config-reference/block-storage/section_volume-drivers.xml index f4c60e8ffa..5a69915494 100644 --- a/doc/config-reference/block-storage/section_volume-drivers.xml +++ b/doc/config-reference/block-storage/section_volume-drivers.xml @@ -29,6 +29,7 @@ + diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index 52837b72ed..d67caca3f3 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -276,15 +276,15 @@ migration_create_volume_timeout_secs storage monkey_patch common monkey_patch_modules common my_ip common -nas_ip nas -nas_login nas -nas_mount_options nas -nas_password nas -nas_private_key nas -nas_secure_file_operations nas -nas_secure_file_permissions nas -nas_share_path nas -nas_ssh_port nas +nas_ip ibmnas +nas_login ibmnas +nas_mount_options ibmnas +nas_password ibmnas +nas_private_key ibmnas +nas_secure_file_operations ibmnas +nas_secure_file_permissions ibmnas +nas_share_path ibmnas +nas_ssh_port ibmnas naviseccli_path emc netapp_controller_ips netapp_eseries_iscsi netapp_copyoffload_tool_path netapp_cdot_nfs diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers index 5c71f027ed..e57b11b3cf 100644 --- a/tools/autogenerate-config-flagmappings/cinder.headers +++ b/tools/autogenerate-config-flagmappings/cinder.headers @@ -25,12 +25,11 @@ hplefthand HP LeftHand/StoreVirtual driver hpmsa HP MSA Fiber Channel driver hpxp HP XP volume driver huawei Huawei storage driver -ibmnas IBM NAS volume driver +ibmnas IBM SONAS and Storwise V7000 volume driver images images infortrend Infortrend volume driver lenovo Lenovo volume driver lvm LVM -nas NAS netapp_7mode_iscsi NetApp 7-Mode iSCSI driver netapp_7mode_nfs NetApp 7-Mode NFS driver netapp_cdot_iscsi NetApp cDOT iSCSI driver