openstack
/
cinder
Code Issues Proposed changes

Merge "VMAX docs - use config-table directive"

This commit is contained in:
Zuul 2018-06-23 02:19:27 +00:00 committed by Gerrit Code Review
parent 89140dddfc 6ac8051314
commit d9ee5372e9
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/volume/drivers/dell_emc/vmax/common.py
View File

@ -75,11 +75,15 @@ vmax_opts = [
cfg.StrOpt(utils.VMAX_ARRAY, cfg.StrOpt(utils.VMAX_ARRAY,
help='Serial number of the array to connect to.'), help='Serial number of the array to connect to.'),
cfg.StrOpt(utils.VMAX_SRP, 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, 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, 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, cfg.ListOpt(utils.VMAX_PORT_GROUPS,
bounds=True, bounds=True,
help='List of port groups containing frontend ports ' help='List of port groups containing frontend ports '

33
doc/source/configuration/block-storage/drivers/dell-emc-vmax-driver.rst
View File

@ -151,40 +151,17 @@ VMAX Driver Integration
#. Configure Block Storage in cinder.conf #. Configure Block Storage in cinder.conf
.. config-table::
:config-target: VMAX
cinder.volume.drivers.dell_emc.vmax.common
.. note:: .. note::
For security and backend uniformity, the use of the XML file for VMAX For security and backend uniformity, the use of the XML file for VMAX
backend configuration was deprecated in Queens and removed entirely backend configuration was deprecated in Queens and removed entirely
in Rocky. 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:: .. note::
``san_api_port`` is ``8443`` by default but can be changed if ``san_api_port`` is ``8443`` by default but can be changed if