From 9400988142a7e390ffe1b7102e7497961287cb91 Mon Sep 17 00:00:00 2001 From: Yong Huang Date: Wed, 6 Jun 2018 18:04:59 +0800 Subject: [PATCH] [VNX Cinder] Deprecate option storage_vnx_pool_name Deprecate option storage_vnx_pool_name, use storage_vnx_pool_names instead Change-Id: I415eee7ddc601d1706a5d7f2a561e11b642fa826 Closes-bug: #1775375 (cherry picked from commit a359e534cc675aaf77a3b1413fcc74224730c955) --- manifests/backend/emc_vnx.pp | 20 +++++++++++++++---- ...torage_vnx_pool_name-a89ae51a3e4f73df.yaml | 4 ++++ spec/defines/cinder_backend_emc_vnx_spec.rb | 10 +++++----- 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/dellemc-vnx-deprecate-storage_vnx_pool_name-a89ae51a3e4f73df.yaml diff --git a/manifests/backend/emc_vnx.pp b/manifests/backend/emc_vnx.pp index 18d88de2..cefe3bcd 100644 --- a/manifests/backend/emc_vnx.pp +++ b/manifests/backend/emc_vnx.pp @@ -20,8 +20,8 @@ # (optional) Login of SAN controller. # Defaults to : 'admin' # -# [*storage_vnx_pool_name*] -# (required) Storage pool name. +# [*storage_vnx_pool_names*] +# (required) Storage pool names. # # [*default_timeout*] # (optional) Default timeout for CLI operations in minutes. @@ -73,10 +73,15 @@ # with volume_backend_name=$volume_backend_name key/value. # Defaults to false. # +# DEPRECATED PARAMETERS +# +# [*storage_vnx_pool_name*] +# (required) Storage pool name. +# define cinder::backend::emc_vnx ( $san_ip, $san_password, - $storage_vnx_pool_name, + $storage_vnx_pool_names, $default_timeout = '10', $max_luns_per_storage_group = '256', $package_ensure = 'present', @@ -90,11 +95,18 @@ define cinder::backend::emc_vnx ( $storage_vnx_security_file_dir = $::os_service_default, $naviseccli_path = $::os_service_default, $manage_volume_type = false, + # DEPRECATED PARAMETERS + $storage_vnx_pool_name = undef, ) { include ::cinder::deps include ::cinder::params + if $storage_vnx_pool_name { + warning('The storage_vnx_pool_name parameter is deprecated. Please use storage_vnx_pool_names instead.') + } + $storage_vnx_pool_names_real = pick($storage_vnx_pool_name, $storage_vnx_pool_names) + cinder_config { "${name}/default_timeout": value => $default_timeout; "${name}/max_luns_per_storage_group": value => $max_luns_per_storage_group; @@ -102,7 +114,7 @@ define cinder::backend::emc_vnx ( "${name}/san_ip": value => $san_ip; "${name}/san_login": value => $san_login; "${name}/san_password": value => $san_password, secret => true; - "${name}/storage_vnx_pool_name": value => $storage_vnx_pool_name; + "${name}/storage_vnx_pool_names": value => $storage_vnx_pool_names_real; "${name}/volume_backend_name": value => $volume_backend_name; "${name}/volume_driver": value => $volume_driver; "${name}/storage_protocol": value => $storage_protocol; diff --git a/releasenotes/notes/dellemc-vnx-deprecate-storage_vnx_pool_name-a89ae51a3e4f73df.yaml b/releasenotes/notes/dellemc-vnx-deprecate-storage_vnx_pool_name-a89ae51a3e4f73df.yaml new file mode 100644 index 00000000..fbfe8836 --- /dev/null +++ b/releasenotes/notes/dellemc-vnx-deprecate-storage_vnx_pool_name-a89ae51a3e4f73df.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - storage_vnx_pool_name is deprecated and will be removed in a future release. + Please use storage_vnx_pool_names instead. diff --git a/spec/defines/cinder_backend_emc_vnx_spec.rb b/spec/defines/cinder_backend_emc_vnx_spec.rb index c09aa544..c3f8c3d5 100644 --- a/spec/defines/cinder_backend_emc_vnx_spec.rb +++ b/spec/defines/cinder_backend_emc_vnx_spec.rb @@ -5,10 +5,10 @@ describe 'cinder::backend::emc_vnx' do let :req_params do { - :san_ip => '127.0.0.2', - :san_login => 'emc', - :san_password => 'password', - :storage_vnx_pool_name => 'emc-storage-pool' + :san_ip => '127.0.0.2', + :san_login => 'emc', + :san_password => 'password', + :storage_vnx_pool_names => 'emc-storage-pool' } end @@ -27,7 +27,7 @@ describe 'cinder::backend::emc_vnx' do is_expected.to contain_cinder_config('emc/san_ip').with_value('127.0.0.2') is_expected.to contain_cinder_config('emc/san_login').with_value('emc') is_expected.to contain_cinder_config('emc/san_password').with_value('password').with_secret(true) - is_expected.to contain_cinder_config('emc/storage_vnx_pool_name').with_value('emc-storage-pool') + is_expected.to contain_cinder_config('emc/storage_vnx_pool_names').with_value('emc-storage-pool') is_expected.to contain_cinder_config('emc/initiator_auto_registration').with_value('') is_expected.to contain_cinder_config('emc/storage_vnx_authentication_type').with_value('') is_expected.to contain_cinder_config('emc/storage_vnx_security_file_dir').with_value('')