openstack/puppet-cinder
Code Issues Proposed changes

[VNX Cinder] Deprecate option storage_vnx_pool_name

Browse Source 
Deprecate option storage_vnx_pool_name, use storage_vnx_pool_names
instead

Change-Id: I415eee7ddc601d1706a5d7f2a561e11b642fa826
Closes-bug: #1775375
This commit is contained in:
Yong Huang 2018-06-06 18:04:59 +08:00
parent 11ccfb41da
commit a359e534cc
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/backend/emc_vnx.pp
View File

@ -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;

4
releasenotes/notes/dellemc-vnx-deprecate-storage_vnx_pool_name-a89ae51a3e4f73df.yaml Normal file
View File

@ -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.

10
spec/defines/cinder_backend_emc_vnx_spec.rb
View File

@ -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('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('emc/storage_vnx_authentication_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('emc/storage_vnx_security_file_dir').with_value('<SERVICE DEFAULT>')