diff --git a/manifests/backend/dellsc_iscsi.pp b/manifests/backend/dellsc_iscsi.pp index e24bf977..74bba44e 100644 --- a/manifests/backend/dellsc_iscsi.pp +++ b/manifests/backend/dellsc_iscsi.pp @@ -43,6 +43,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. +# Defaults to $::os_service_default +# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza. # Defaults to: {} @@ -67,6 +71,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, $manage_volume_type = false, $extra_options = {}, ) { @@ -97,6 +102,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_ip": value => $excluded_domain_ip; } if $manage_volume_type { diff --git a/manifests/volume/dellsc_iscsi.pp b/manifests/volume/dellsc_iscsi.pp index a7b58cd8..fecce834 100644 --- a/manifests/volume/dellsc_iscsi.pp +++ b/manifests/volume/dellsc_iscsi.pp @@ -39,6 +39,10 @@ # (optional) The Storage Center iSCSI IP port. # Defaults to $::os_service_default # +# [*excluded_domain_ip*] +# (optional) Domain IP to be excluded from iSCSI returns of Storage Center. +# Defaults to $::os_service_default +# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza. # Defaults to: {} @@ -56,6 +60,7 @@ class cinder::volume::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, $extra_options = {}, ) { @@ -75,6 +80,7 @@ cinder::backend::dellsc_iscsi instead.') dell_sc_verify_cert => $dell_sc_verify_cert, dell_sc_volume_folder => $dell_sc_volume_folder, iscsi_port => $iscsi_port, + excluded_domain_ip => $excluded_domain_ip, extra_options => $extra_options, } } diff --git a/spec/classes/cinder_volume_dellsc_iscsi_spec.rb b/spec/classes/cinder_volume_dellsc_iscsi_spec.rb index ffa61723..c4860eaf 100644 --- a/spec/classes/cinder_volume_dellsc_iscsi_spec.rb +++ b/spec/classes/cinder_volume_dellsc_iscsi_spec.rb @@ -19,6 +19,7 @@ describe 'cinder::volume::dellsc_iscsi' do :dell_sc_verify_cert => '', :dell_sc_volume_folder => 'vol', :iscsi_port => '', + :excluded_domain_ip => '', } end diff --git a/spec/defines/cinder_backend_dellsc_iscsi_spec.rb b/spec/defines/cinder_backend_dellsc_iscsi_spec.rb index fc10d952..7e712c50 100644 --- a/spec/defines/cinder_backend_dellsc_iscsi_spec.rb +++ b/spec/defines/cinder_backend_dellsc_iscsi_spec.rb @@ -23,6 +23,7 @@ describe 'cinder::backend::dellsc_iscsi' do :dell_sc_verify_cert => '', :dell_sc_volume_folder => 'vol', :iscsi_port => '', + :excluded_domain_ip => '', } end