diff --git a/manifests/backend/dellemc_xtremio.pp b/manifests/backend/dellemc_xtremio.pp index 6d96e4df..7b818b0c 100644 --- a/manifests/backend/dellemc_xtremio.pp +++ b/manifests/backend/dellemc_xtremio.pp @@ -38,6 +38,11 @@ # (optional) Number of volumes created from each cached glance image. # Defaults to 100 # +# [*xtremio_ports*] +# (optional) Allowed ports. Comma separated list of XtremIO iSCSI IPs or +# FC WWNs (ex. 58:cc:f0:98:49:22:07:02) to be used. If is not set all ports +# are allowed. +# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza. # Defaults to: {} @@ -68,6 +73,7 @@ define cinder::backend::dellemc_xtremio ( $xtremio_volumes_per_glance_cache = 100, $manage_volume_type = false, $xtremio_storage_protocol = 'iSCSI', + $xtremio_ports = $::os_service_default, $extra_options = {}, ) { @@ -94,6 +100,7 @@ define cinder::backend::dellemc_xtremio ( "${name}/xtremio_array_busy_retry_count": value => $xtremio_array_busy_retry_count; "${name}/xtremio_array_busy_retry_interval": value => $xtremio_array_busy_retry_interval; "${name}/xtremio_volumes_per_glance_cache": value => $xtremio_volumes_per_glance_cache; + "${name}/xtremio_ports": value => $xtremio_ports; } diff --git a/manifests/backend/dellemc_xtremio_iscsi.pp b/manifests/backend/dellemc_xtremio_iscsi.pp index 2896ac55..ccd1f993 100644 --- a/manifests/backend/dellemc_xtremio_iscsi.pp +++ b/manifests/backend/dellemc_xtremio_iscsi.pp @@ -38,6 +38,11 @@ # (optional) Number of volumes created from each cached glance image. # Defaults to 100 # +# [*xtremio_ports*] +# (optional) Allowed ports. Comma separated list of XtremIO iSCSI IPs or +# FC WWNs (ex. 58:cc:f0:98:49:22:07:02) to be used. If is not set all ports +# are allowed. +# # [*extra_options*] # (optional) Hash of extra options to pass to the backend stanza. # Defaults to: {} @@ -61,6 +66,7 @@ define cinder::backend::dellemc_xtremio_iscsi ( $xtremio_array_busy_retry_interval = 5, $xtremio_volumes_per_glance_cache = 100, $manage_volume_type = false, + $xtremio_ports = $::os_service_default, $extra_options = {}, ) { @@ -81,6 +87,7 @@ please use cinder::backend::dellemc_xtremio resource instead.') "${name}/xtremio_array_busy_retry_count": value => $xtremio_array_busy_retry_count; "${name}/xtremio_array_busy_retry_interval": value => $xtremio_array_busy_retry_interval; "${name}/xtremio_volumes_per_glance_cache": value => $xtremio_volumes_per_glance_cache; + "${name}/xtremio_ports": value => $xtremio_ports; } diff --git a/releasenotes/notes/xtremio-add-ports-option-6d6e98fb90b906fe.yaml b/releasenotes/notes/xtremio-add-ports-option-6d6e98fb90b906fe.yaml new file mode 100644 index 00000000..004cdb58 --- /dev/null +++ b/releasenotes/notes/xtremio-add-ports-option-6d6e98fb90b906fe.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + `Bug #1915800 `_: + Add support for ports filtering in XtremIO driver. \ No newline at end of file diff --git a/spec/defines/cinder_backend_dellemc_xtremio_spec.rb b/spec/defines/cinder_backend_dellemc_xtremio_spec.rb index d817ca33..48203ba0 100644 --- a/spec/defines/cinder_backend_dellemc_xtremio_spec.rb +++ b/spec/defines/cinder_backend_dellemc_xtremio_spec.rb @@ -20,6 +20,7 @@ describe 'cinder::backend::dellemc_xtremio_iscsi' do :xtremio_array_busy_retry_count => 5, :xtremio_array_busy_retry_interval => 5, :xtremio_volumes_per_glance_cache => 100, + :xtremio_ports => '', } end @@ -29,6 +30,7 @@ describe 'cinder::backend::dellemc_xtremio_iscsi' do :xtremio_array_busy_retry_count => 15, :xtremio_array_busy_retry_interval => 25, :xtremio_volumes_per_glance_cache => 10, + :xtremio_ports => '10.10.57.45,10.10.57.46', } end