openstack
/
manila
Code Issues Proposed changes

Merge "[Manila Unity] Set unity_server_meta_pool option as required" into stable/queens

This commit is contained in:
Zuul 2018-06-22 09:34:44 +00:00 committed by Gerrit Code Review
parent 0c182bca86 a725d26770
commit a6acc9ecb6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/configuration/shared-file-systems/drivers/dell-emc-unity-driver.rst
View File

@ -1,6 +1,6 @@
================
EMC Unity driver
================
=====================
Dell EMC Unity driver
=====================
The EMC Shared File Systems service driver framework (EMCShareDriver)
utilizes the EMC storage products to provide the shared file systems to
@ -176,6 +176,7 @@ for the Unity driver.
- ``unity_server_meta_pool``
The name of the pool to persist the meta-data of NAS server.
This option is required.
- ``unity_share_data_pools``
Comma separated list specifying the name of the pools to be used

1
manila/share/drivers/dell_emc/plugins/unity/connection.py
View File

@ -43,6 +43,7 @@ SUPPORTED_NETWORK_TYPES = (None, 'flat', 'vlan')
UNITY_OPTS = [
cfg.StrOpt('unity_server_meta_pool',
required=True,
deprecated_name='emc_nas_server_pool',
help='Pool to persist the meta-data of NAS server.'),
cfg.ListOpt('unity_share_data_pools',

2
manila/tests/conf_fixture.py
View File

@ -61,6 +61,8 @@ def set_defaults(conf):
_safe_set_of_opts(conf, 'qnap_nas_password', 'qnapadmin')
_safe_set_of_opts(conf, 'qnap_poolname', 'Storage Pool 1')
_safe_set_of_opts(conf, 'unity_server_meta_pool', 'nas_server_pool')
def _safe_set_of_opts(conf, *args, **kwargs):
try: