openstack/puppet-cinder
Code Issues Proposed changes

Dell EMC SC: Add support for excluded_domain_ips

Browse Source 
The Dell EMC SC configuration option excluded_domain_ip has been
deprecated and will be removed in a future release. Deployments
should now migrate to the option excluded_domain_ips for
equivalent functionality.

Change-Id: If517d1260b690c32eba6f7b6dab55c9dced78de7
This commit is contained in:
rajinir 2018-09-21 10:14:50 -05:00
parent 0d42dbfd8e
commit 176ef1317a
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/backend/dellsc_iscsi.pp
View File

@ -49,8 +49,10 @@
# (optional) The ISCSI IP Port of the Storage Center.
# Defaults to $::os_service_default
#
# [*excluded_domain_ip*]
# (optional) Domain IP to be excluded from iSCSI returns of Storage Center.
# [*excluded_domain_ips*]
# (optional)Comma separated list of domain IPs to be excluded from
# iSCSI returns of Storage Center.
# Defaults to $::os_service_default
#
# [*secondary_san_ip*]
# (optional) IP address of secondary DSM controller.
@ -84,6 +86,11 @@
# (Optional) Enables multipath configuration.
# Defaults to true.
#
# DEPRECATED PARAMETERS
# [*excluded_domain_ip*]
# (optional) Domain IP to be excluded from iSCSI returns of Storage Center.
# Defaults to undef.
#
define cinder::backend::dellsc_iscsi (
$san_ip,
$san_login,
@ -97,7 +104,7 @@ define cinder::backend::dellsc_iscsi (
$dell_sc_verify_cert = $::os_service_default,
$dell_sc_volume_folder = 'vol',
$iscsi_port = $::os_service_default,
$excluded_domain_ip = $::os_service_default,
$excluded_domain_ips = $::os_service_default,
$secondary_san_ip = $::os_service_default,
$secondary_san_login = $::os_service_default,
$secondary_san_password = $::os_service_default,
@ -105,6 +112,8 @@ define cinder::backend::dellsc_iscsi (
$manage_volume_type = false,
$use_multipath_for_image_xfer = true,
$extra_options = {},
# DEPRECATED PARAMETERS
$excluded_domain_ip = undef,
) {
include ::cinder::deps
@ -134,6 +143,7 @@ default of \"vol\" and will be changed to the upstream OpenStack default in N-re
"${name}/dell_sc_verify_cert": value => $dell_sc_verify_cert;
"${name}/dell_sc_volume_folder": value => $dell_sc_volume_folder;
"${name}/iscsi_port": value => $iscsi_port;
"${name}/excluded_domain_ips": value => $excluded_domain_ips;
"${name}/secondary_san_ip": value => $secondary_san_ip;
"${name}/secondary_san_login": value => $secondary_san_login;
"${name}/secondary_san_password": value => $secondary_san_password, secret => true;
@ -142,6 +152,7 @@ default of \"vol\" and will be changed to the upstream OpenStack default in N-re
}
if $excluded_domain_ip {
warning('The excluded_domain_ip is deprecated. Please use excluded_domain_ips instead.')
cinder_config {
"${name}/excluded_domain_ip": value => $excluded_domain_ip;
}

5
releasenotes/notes/sc-driver-exclude-domain-a428e372280c44e8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- The Dell EMC SC configuration option excluded_domain_ip has been deprecated
and will be removed in a future release. Deployments should now migrate to
the option excluded_domain_ips for equivalent functionality.

2
spec/defines/cinder_backend_dellsc_iscsi_spec.rb
View File

@ -24,7 +24,7 @@ describe 'cinder::backend::dellsc_iscsi' do
:dell_sc_verify_cert => '<SERVICE DEFAULT>',
:dell_sc_volume_folder => 'vol',
:iscsi_port => '<SERVICE DEFAULT>',
:excluded_domain_ip => '<SERVICE DEFAULT>',
:excluded_domain_ips => '<SERVICE DEFAULT>',
:secondary_san_ip => '<SERVICE DEFAULT>',
:secondary_san_login => '<SERVICE DEFAULT>',
:secondary_san_password => '<SERVICE DEFAULT>',