From 68f5a1daf832127d661d01ef98d7a05fd23fd280 Mon Sep 17 00:00:00 2001 From: Trygve Vea Date: Mon, 17 Oct 2016 10:44:25 +0200 Subject: [PATCH] Deprecate iscsi_ip_address, as it is not used The EMC VNX volume drivers does not use iscsi_ip_address for anything. The iscsi_ip_address parameter is deprecated, has no effect and will be removed in future release. Change-Id: Ib8705171c4750d2039ff97a616eae9f309db08a0 --- manifests/backend/emc_vnx.pp | 17 ++++++++++++----- manifests/volume/emc_vnx.pp | 13 +++++++++---- ...ecate_iscsi_ip_address-773b9c158c7751b7.yaml | 4 ++++ spec/classes/cinder_volume_emc_vnx_spec.rb | 1 - spec/defines/cinder_backend_emc_vnx_spec.rb | 3 --- 5 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/emc_vnx_deprecate_iscsi_ip_address-773b9c158c7751b7.yaml diff --git a/manifests/backend/emc_vnx.pp b/manifests/backend/emc_vnx.pp index 01e42e63..599bf5f7 100644 --- a/manifests/backend/emc_vnx.pp +++ b/manifests/backend/emc_vnx.pp @@ -10,9 +10,6 @@ # (optional) Allows for the volume_backend_name to be separate of $name. # Defaults to: $name # -# [*iscsi_ip_address*] -# (Required) The IP address that the iSCSI daemon is listening on -# # [*san_ip*] # (required) IP address of SAN controller. # @@ -72,8 +69,13 @@ # with volume_backend_name=$volume_backend_name key/value. # Defaults to false. # +# == Deprecated Parameters +# +# [*iscsi_ip_address*] +# (optional) DEPRECATED The IP address that the iSCSI daemon is listening on +# Defaults to undef +# define cinder::backend::emc_vnx ( - $iscsi_ip_address, $san_ip, $san_password, $storage_vnx_pool_name, @@ -89,14 +91,19 @@ define cinder::backend::emc_vnx ( $storage_vnx_security_file_dir = $::os_service_default, $naviseccli_path = $::os_service_default, $manage_volume_type = false, + # Deprecated + $iscsi_ip_address = undef, ) { include ::cinder::deps include ::cinder::params + if $iscsi_ip_address { + warning('iscsi_ip_address is deprecated, has no effect and will be removed in a future release') + } + cinder_config { "${name}/default_timeout": value => $default_timeout; - "${name}/iscsi_ip_address": value => $iscsi_ip_address; "${name}/max_luns_per_storage_group": value => $max_luns_per_storage_group; "${name}/naviseccli_path": value => $naviseccli_path; "${name}/san_ip": value => $san_ip; diff --git a/manifests/volume/emc_vnx.pp b/manifests/volume/emc_vnx.pp index 348946ce..a935406a 100644 --- a/manifests/volume/emc_vnx.pp +++ b/manifests/volume/emc_vnx.pp @@ -9,9 +9,6 @@ # (Optional) State of the package # Defaults to 'present'. # -# [*iscsi_ip_address*] -# (Required) The IP address that the iSCSI daemon is listening on -# # [*san_ip*] # (Required) IP address of SAN controller. # @@ -61,8 +58,14 @@ # (optional) Naviseccli Path. # Defaults to $::os_service_default # +# == Deprecated Parameters +# +# [*iscsi_ip_address*] +# (Optional) DEPRECATED The IP address that the iSCSI daemon is listening on +# Defaults to undef +# + class cinder::volume::emc_vnx( - $iscsi_ip_address, $san_ip, $san_password, $storage_vnx_pool_name, @@ -76,6 +79,8 @@ class cinder::volume::emc_vnx( $storage_vnx_auth_type = $::os_service_default, $storage_vnx_security_file_dir = $::os_service_default, $naviseccli_path = $::os_service_default, + # Deprecated + $iscsi_ip_address = undef, ) { include ::cinder::deps diff --git a/releasenotes/notes/emc_vnx_deprecate_iscsi_ip_address-773b9c158c7751b7.yaml b/releasenotes/notes/emc_vnx_deprecate_iscsi_ip_address-773b9c158c7751b7.yaml new file mode 100644 index 00000000..6ec36adf --- /dev/null +++ b/releasenotes/notes/emc_vnx_deprecate_iscsi_ip_address-773b9c158c7751b7.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - Deprecate iscsi_ip_address parameter in cinder::backend::emc_vnx + - Deprecate iscsi_ip_address parameter in cinder::volume::emc_vnx diff --git a/spec/classes/cinder_volume_emc_vnx_spec.rb b/spec/classes/cinder_volume_emc_vnx_spec.rb index bd1b0f97..1d1748d5 100644 --- a/spec/classes/cinder_volume_emc_vnx_spec.rb +++ b/spec/classes/cinder_volume_emc_vnx_spec.rb @@ -25,7 +25,6 @@ describe 'cinder::volume::emc_vnx' do is_expected.to contain_cinder_config('DEFAULT/san_ip').with_value('127.0.0.2') is_expected.to contain_cinder_config('DEFAULT/san_login').with_value('emc') is_expected.to contain_cinder_config('DEFAULT/san_password').with_value('password') - is_expected.to contain_cinder_config('DEFAULT/iscsi_ip_address').with_value('127.0.0.3') is_expected.to contain_cinder_config('DEFAULT/storage_vnx_pool_name').with_value('emc-storage-pool') is_expected.to contain_cinder_config('DEFAULT/initiator_auto_registration').with_value('') is_expected.to contain_cinder_config('DEFAULT/storage_vnx_authentication_type').with_value('') diff --git a/spec/defines/cinder_backend_emc_vnx_spec.rb b/spec/defines/cinder_backend_emc_vnx_spec.rb index 9474073b..464afc3d 100644 --- a/spec/defines/cinder_backend_emc_vnx_spec.rb +++ b/spec/defines/cinder_backend_emc_vnx_spec.rb @@ -8,7 +8,6 @@ describe 'cinder::backend::emc_vnx' do :san_ip => '127.0.0.2', :san_login => 'emc', :san_password => 'password', - :iscsi_ip_address => '127.0.0.3', :storage_vnx_pool_name => 'emc-storage-pool' } end @@ -27,13 +26,11 @@ 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') - is_expected.to contain_cinder_config('emc/iscsi_ip_address').with_value('127.0.0.3') is_expected.to contain_cinder_config('emc/storage_vnx_pool_name').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('') is_expected.to contain_cinder_config('emc/naviseccli_path').with_value('') - end end