Merge "Add ports filtering support to XtremIO Cinder driver" into stable/victoria

This commit is contained in:
Zuul 2021-07-13 06:23:09 +00:00 committed by Gerrit Code Review
commit 8f315831c2
5 changed files with 22 additions and 0 deletions

View File

@ -55,6 +55,12 @@ parameters:
of copies (XtremIO snapshots) taken from each image cache.
A value of 0 ignores the limit and defers to the array
maximum as the effective limit.
CinderDellEMCXTREMIOIscsiPorts:
type: string
default: ''
description: 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 option is not set all ports are allowed.
ServiceData:
default: {}
description: Dictionary packing service data
@ -96,6 +102,7 @@ parameter_groups:
- CinderDellEMCXTREMIOIscsiArrayBusyRetryCount
- CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval
- CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache
- CinderDellEMCXTREMIOIscsiPorts
outputs:
role_data:
@ -113,6 +120,7 @@ outputs:
cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryCount}
cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval}
cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache: {get_param: CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache}
cinder::backend::dellemc_xtremio_iscsi::xtremio_ports: {get_param: CinderDellEMCXTREMIOIscsiPorts}
-
if:
- {equals : [{get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone}, '']}

View File

@ -66,6 +66,12 @@ parameters:
default: 'iSCSI'
constraints:
- allowed_values: [ 'iSCSI', 'FC']
CinderXtremioPorts:
type: string
default: ''
description: 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 option is not set all ports are allowed.
ServiceData:
default: {}
description: Dictionary packing service data
@ -111,6 +117,7 @@ outputs:
cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_interval: {get_param: CinderXtremioArrayBusyRetryInterval}
cinder::backend::dellemc_xtremio::xtremio_volumes_per_glance_cache: {get_param: CinderXtremioVolumesPerGlanceCache}
cinder::backend::dellemc_xtremio::xtremio_storage_protocol: {get_param: CinderXtremioStorageProtocol}
cinder::backend::dellemc_xtremio::xtremio_ports: {get_param: CinderXtremioPorts}
-
if:
- {equals : [{get_param: CinderXtremioAvailabilityZone}, '']}

View File

@ -13,6 +13,7 @@ parameter_defaults:
CinderXtremioArrayBusyRetryCount: 5
CinderXtremioArrayBusyRetryInterval: 5
CinderXtremioVolumesPerGlanceCache: 100
CinderXtremioPorts: ''
# To configure multiple backends, use CinderXtremioMultiConfig to
# assign parameter values specific to that backend. CinderXtremioMultiConfig
# is a dictionary of the parameter values for each backend specified in

View File

@ -16,3 +16,4 @@ parameter_defaults:
CinderDellEMCXTREMIOIscsiArrayBusyRetryCount: 5
CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval: 5
CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache: 100
CinderDellEMCXTREMIOIscsiPorts: ''

View File

@ -0,0 +1,5 @@
---
fixes:
- |
`Bug #1915800 <https://bugs.launchpad.net/cinder/+bug/1915800>`_:
Add support for ports filtering in XtremIO driver.