openstack
/
tripleo-heat-templates
Code Issues Proposed changes

storage_vnx_pool_name is incorrect for VNX cinder driver. 

Correct option is storage_vnx_pool_names, so environments and puppet
service yamls need to be changed.

Depends-On: https://review.openstack.org/#/c/572720/
Closes-bug: #1775752

Change-Id: I98ec997847443673b49552d1223238bc9da03cf4
This commit is contained in:
Yong Huang 2018-06-08 10:44:29 +08:00
parent e0139adfda
commit 1fa441479b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/cinder-dellemc-vnx-config.yaml
View File

@ -10,7 +10,7 @@ parameter_defaults:
CinderDellEMCVNXSanLogin: 'admin' CinderDellEMCVNXSanLogin: 'admin'
CinderDellEMCVNXSanPassword: '' CinderDellEMCVNXSanPassword: ''
CinderDellEMCVNXStorageProtocol: 'iscsi' CinderDellEMCVNXStorageProtocol: 'iscsi'
CinderDellEMCVNXStoragePoolName: '' CinderDellEMCVNXStoragePoolNames: ''
CinderDellEMCVNXDefaultTimeout: 3600 CinderDellEMCVNXDefaultTimeout: 3600
CinderDellEMCVNXMaxLunsPerStorageGroup: 255 CinderDellEMCVNXMaxLunsPerStorageGroup: 255
CinderDellEMCVNXInitiatorAutoRegistration: 'true' CinderDellEMCVNXInitiatorAutoRegistration: 'true'

6
puppet/services/cinder-backend-dellemc-vnx.yaml
View File

@ -35,8 +35,8 @@ parameters:
CinderDellEMCVNXStorageProtocol: CinderDellEMCVNXStorageProtocol:
type: string type: string
default: iscsi default: iscsi
CinderDellEMCVNXStoragePoolName: CinderDellEMCVNXStoragePoolNames:
type: string type: comma_delimited_list
default: '' default: ''
CinderDellEMCVNXDefaultTimeout: CinderDellEMCVNXDefaultTimeout:
type: number type: number
@ -95,7 +95,7 @@ outputs:
cinder::backend::emc_vnx::san_login: {get_param: CinderDellEMCVNXSanLogin} cinder::backend::emc_vnx::san_login: {get_param: CinderDellEMCVNXSanLogin}
cinder::backend::emc_vnx::san_password: {get_param: CinderDellEMCVNXSanPassword} cinder::backend::emc_vnx::san_password: {get_param: CinderDellEMCVNXSanPassword}
cinder::backend::emc_vnx::storage_protocol: {get_param: CinderDellEMCVNXStorageProtocol} cinder::backend::emc_vnx::storage_protocol: {get_param: CinderDellEMCVNXStorageProtocol}
cinder::backend::emc_vnx::storage_vnx_pool_name: {get_param: CinderDellEMCVNXStoragePoolName} cinder::backend::emc_vnx::storage_vnx_pool_names: {get_param: CinderDellEMCVNXStoragePoolNames}
cinder::backend::emc_vnx::default_timeout: {get_param: CinderDellEMCVNXDefaultTimeout} cinder::backend::emc_vnx::default_timeout: {get_param: CinderDellEMCVNXDefaultTimeout}
cinder::backend::emc_vnx::max_luns_per_storage_group: {get_param: CinderDellEMCVNXMaxLunsPerStorageGroup} cinder::backend::emc_vnx::max_luns_per_storage_group: {get_param: CinderDellEMCVNXMaxLunsPerStorageGroup}
cinder::backend::emc_vnx::initiator_auto_registration: {get_param: CinderDellEMCVNXInitiatorAutoRegistration} cinder::backend::emc_vnx::initiator_auto_registration: {get_param: CinderDellEMCVNXInitiatorAutoRegistration}