diff --git a/cinder/volume/drivers/dell_emc/vmax/common.py b/cinder/volume/drivers/dell_emc/vmax/common.py index 45ea63d78d5..07a38c13c0c 100644 --- a/cinder/volume/drivers/dell_emc/vmax/common.py +++ b/cinder/volume/drivers/dell_emc/vmax/common.py @@ -75,11 +75,15 @@ vmax_opts = [ cfg.StrOpt(utils.VMAX_ARRAY, help='Serial number of the array to connect to.'), cfg.StrOpt(utils.VMAX_SRP, - help='Storage resource pool on array to use for provisioning.'), + help='Storage resource pool on array to use for ' + 'provisioning.'), cfg.StrOpt(utils.VMAX_SERVICE_LEVEL, - help='Service level to use for provisioning storage.'), + help='Service level to use for provisioning storage. ' + 'Setting this as an extra spec in pool_name ' + 'is preferable.'), cfg.StrOpt(utils.VMAX_WORKLOAD, - help='Workload'), + help='Workload, setting this as an extra spec in ' + 'pool_name is preferable.'), cfg.ListOpt(utils.VMAX_PORT_GROUPS, bounds=True, help='List of port groups containing frontend ports ' diff --git a/doc/source/configuration/block-storage/drivers/dell-emc-vmax-driver.rst b/doc/source/configuration/block-storage/drivers/dell-emc-vmax-driver.rst index 38168d0fe2e..f6a5540a13d 100644 --- a/doc/source/configuration/block-storage/drivers/dell-emc-vmax-driver.rst +++ b/doc/source/configuration/block-storage/drivers/dell-emc-vmax-driver.rst @@ -151,40 +151,17 @@ VMAX Driver Integration #. Configure Block Storage in cinder.conf + .. config-table:: + :config-target: VMAX + + cinder.volume.drivers.dell_emc.vmax.common + .. note:: For security and backend uniformity, the use of the XML file for VMAX backend configuration was deprecated in Queens and removed entirely in Rocky. - +-----------------+------------------------+---------+----------+---------------------------+ - | VMAX parameter | cinder.conf parameter | Default | Required | Description | - +=================+========================+=========+==========+===========================+ - | RestServerIp | san_ip | " | Yes | IP address of the | - | | | | | Unisphere server | - +-----------------+------------------------+---------+----------+---------------------------+ - | RestServerPort | san_api_port | 8443 | No | Port of the | - | | | | | Unisphere server | - +-----------------+------------------------+---------+----------+---------------------------+ - | RestUserName | san_login | 'admin' | Yes | Username of the | - | | | | | Unisphere server | - +-----------------+------------------------+---------+----------+---------------------------+ - | RestPassword | san_password | " | Yes | Password of the | - | | | | | Unisphere server | - +-----------------+------------------------+---------+----------+---------------------------+ - | Array | vmax_array | None | Yes | Unique VMAX array | - | | | | | serial number | - +-----------------+------------------------+---------+----------+---------------------------+ - | SRP | vmax_srp | None | Yes | Name of the | - | | | | | storage resource pool | - +-----------------+------------------------+---------+----------+---------------------------+ - | PortGroups | vmax_port_groups | None | Yes | The name(s) of VMAX | - | | | | | port group(s) | - +-----------------+------------------------+---------+----------+---------------------------+ - | SSLVerify | driver_ssl_cert_verify | False | No | The path to the | - | | driver_ssl_cert_path | None | No | ``my_unisphere_host.pem`` | - +-----------------+------------------------+---------+----------+---------------------------+ - .. note:: ``san_api_port`` is ``8443`` by default but can be changed if