From 31fbb1ecfcfa254c0b0742976099e432101e8d7b Mon Sep 17 00:00:00 2001 From: Yong Huang Date: Fri, 8 Jun 2018 10:44:29 +0800 Subject: [PATCH] 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 (cherry picked from commit 1fa441479b378a448c78e7a1a354f46850f2b4cd) --- environments/cinder-dellemc-vnx-config.yaml | 2 +- puppet/services/cinder-backend-dellemc-vnx.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/cinder-dellemc-vnx-config.yaml b/environments/cinder-dellemc-vnx-config.yaml index 5c02b7901f..d85262bd9f 100644 --- a/environments/cinder-dellemc-vnx-config.yaml +++ b/environments/cinder-dellemc-vnx-config.yaml @@ -10,7 +10,7 @@ parameter_defaults: CinderDellEMCVNXSanLogin: 'admin' CinderDellEMCVNXSanPassword: '' CinderDellEMCVNXStorageProtocol: 'iscsi' - CinderDellEMCVNXStoragePoolName: '' + CinderDellEMCVNXStoragePoolNames: '' CinderDellEMCVNXDefaultTimeout: 3600 CinderDellEMCVNXMaxLunsPerStorageGroup: 255 CinderDellEMCVNXInitiatorAutoRegistration: 'true' diff --git a/puppet/services/cinder-backend-dellemc-vnx.yaml b/puppet/services/cinder-backend-dellemc-vnx.yaml index 10e912878b..ddb6f6f2c7 100644 --- a/puppet/services/cinder-backend-dellemc-vnx.yaml +++ b/puppet/services/cinder-backend-dellemc-vnx.yaml @@ -35,8 +35,8 @@ parameters: CinderDellEMCVNXStorageProtocol: type: string default: iscsi - CinderDellEMCVNXStoragePoolName: - type: string + CinderDellEMCVNXStoragePoolNames: + type: comma_delimited_list default: '' CinderDellEMCVNXDefaultTimeout: type: number @@ -95,7 +95,7 @@ outputs: cinder::backend::emc_vnx::san_login: {get_param: CinderDellEMCVNXSanLogin} cinder::backend::emc_vnx::san_password: {get_param: CinderDellEMCVNXSanPassword} 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::max_luns_per_storage_group: {get_param: CinderDellEMCVNXMaxLunsPerStorageGroup} cinder::backend::emc_vnx::initiator_auto_registration: {get_param: CinderDellEMCVNXInitiatorAutoRegistration}