openstack/puppet-cinder
Code Issues Proposed changes

XtremIO: Remove hard-coded defaults

Browse Source 
Currently we hard-code default values of XtremIO driver parameters but
these default values are same as the service defaults.

This change replaces hard-coded defaults by service defaults. This
allows us to avoid maintaining own default values in puppet modules,
and reduces amount of maintenance effort.

Change-Id: I3d085b2b8441153c356062bd22ac2521950bff35
This commit is contained in:
Takashi Kajinami 2022-03-23 18:33:03 +09:00
parent 9bfb474ae1
commit 258098f2b2
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/backend/dellemc_xtremio.pp
View File

@ -28,20 +28,21 @@
#
# [*xtremio_array_busy_retry_count*]
# (optional) Number of retries in case array is busy.
# Defaults to 5
# Defaults to $::os_service_default
#
# [*xtremio_array_busy_retry_interval*]
# (optional) Interval between retries in case array is busy.
# Defaults to 5
# Defaults to $::os_service_default
#
# [*xtremio_volumes_per_glance_cache*]
# (optional) Number of volumes created from each cached glance image.
# Defaults to 100
# Defaults to $::os_service_default
#
# [*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.
# Defaults to $::os_service_default
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza.
@ -68,9 +69,9 @@ define cinder::backend::dellemc_xtremio (
$xtremio_cluster_name,
$volume_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$xtremio_array_busy_retry_count = 5,
$xtremio_array_busy_retry_interval = 5,
$xtremio_volumes_per_glance_cache = 100,
$xtremio_array_busy_retry_count = $::os_service_default,
$xtremio_array_busy_retry_interval = $::os_service_default,
$xtremio_volumes_per_glance_cache = $::os_service_default,
$manage_volume_type = false,
$xtremio_storage_protocol = 'iSCSI',
$xtremio_ports = $::os_service_default,

12
spec/defines/cinder_backend_dellemc_xtremio_spec.rb
View File

@ -17,9 +17,10 @@ describe 'cinder::backend::dellemc_xtremio' do
let :default_params do
{
:backend_availability_zone => '<SERVICE DEFAULT>',
:xtremio_array_busy_retry_count => 5,
:xtremio_array_busy_retry_interval => 5,
:xtremio_volumes_per_glance_cache => 100,
:xtremio_array_busy_retry_count => '<SERVICE DEFAULT>',
:xtremio_array_busy_retry_interval => '<SERVICE DEFAULT>',
:xtremio_volumes_per_glance_cache => '<SERVICE DEFAULT>',
:xtremio_ports => '<SERVICE DEFAULT>',
}
end
@ -27,8 +28,9 @@ describe 'cinder::backend::dellemc_xtremio' do
{
:backend_availability_zone => 'my_zone',
:xtremio_array_busy_retry_count => 15,
:xtremio_array_busy_retry_interval => 25,
:xtremio_volumes_per_glance_cache => 10,
:xtremio_array_busy_retry_interval => 6,
:xtremio_volumes_per_glance_cache => 100,
:xtremio_ports => '58:cc:f0:98:49:22:07:02',
}
end