openstack/puppet-cinder
Code Issues Proposed changes

Deprecate the powerstore_appliances parameter

Browse Source 
... because it was already deprecated[1] in cinder and has no effect.

[1] f328341ed0eb920a6471f7c65e06b27c3f719fbe
Change-Id: Ic25a2a88ccfc5eddf180d44cb109d69378c5277f
This commit is contained in:
Takashi Kajinami 2021-05-16 21:25:06 +09:00
parent 496eb152f9
commit e73bf6a864
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/backend/dellemc_powerstore.pp
View File

@ -13,9 +13,6 @@
# [*san_password*] # [*san_password*]
# (required) PowerStore REST password # (required) PowerStore REST password
# #
# [*powerstore_appliances*]
# (required) PowerStore appliances
#
# [*powerstore_ports*] # [*powerstore_ports*]
# (optional) PowerStore allowed ports # (optional) PowerStore allowed ports
# #
@ -45,21 +42,31 @@
# Example: # Example:
# { 'dellemc_powerstore_backend/param1' => { 'value' => value1 } } # { 'dellemc_powerstore_backend/param1' => { 'value' => value1 } }
# #
# DEPRECATED PARAMETERS
#
# [*powerstore_appliances*]
# (optional) PowerStore appliances
# Defaults to undef
#
define cinder::backend::dellemc_powerstore ( define cinder::backend::dellemc_powerstore (
$san_ip, $san_ip,
$san_login, $san_login,
$san_password, $san_password,
$powerstore_appliances,
$powerstore_ports = $::os_service_default, $powerstore_ports = $::os_service_default,
$storage_protocol = 'iSCSI', $storage_protocol = 'iSCSI',
$volume_backend_name = $name, $volume_backend_name = $name,
$backend_availability_zone = $::os_service_default, $backend_availability_zone = $::os_service_default,
$manage_volume_type = false, $manage_volume_type = false,
$extra_options = {}, $extra_options = {},
$powerstore_appliances = undef,
) { ) {
include cinder::deps include cinder::deps
if $powerstore_appliances != undef {
warning('The powerstore_appliances parameter has been deprecated and has no effect')
}
if $storage_protocol == 'iSCSI' { if $storage_protocol == 'iSCSI' {
$driver = 'dell_emc.powerstore.driver.PowerStoreDriver' $driver = 'dell_emc.powerstore.driver.PowerStoreDriver'
} }
@ -77,10 +84,12 @@ define cinder::backend::dellemc_powerstore (
"${name}/san_ip": value => $san_ip; "${name}/san_ip": value => $san_ip;
"${name}/san_login": value => $san_login; "${name}/san_login": value => $san_login;
"${name}/san_password": value => $san_password, secret => true; "${name}/san_password": value => $san_password, secret => true;
"${name}/powerstore_appliances": value => $powerstore_appliances;
"${name}/powerstore_ports": value => $powerstore_ports; "${name}/powerstore_ports": value => $powerstore_ports;
"${name}/storage_protocol": value => $storage_protocol; "${name}/storage_protocol": value => $storage_protocol;
}
cinder_config {
"${name}/powerstore_appliances": ensure => absent;
} }
if $manage_volume_type { if $manage_volume_type {

6
releasenotes/notes/deprecate-powerstore_appliances-1a3ef9166d1b35ad.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``cinder::backend::dellemc_powerstore::powerstore_appliances``
parameter has been deprecated and has no effect now. This parameter will be
removed in a future release.

2
spec/defines/cinder_backend_dellemc_powerstore_spec.rb
View File

@ -10,8 +10,6 @@ describe 'cinder::backend::dellemc_powerstore' do
:san_ip => '172.23.8.101', :san_ip => '172.23.8.101',
:san_login => 'Admin', :san_login => 'Admin',
:san_password => '12345', :san_password => '12345',
:powerstore_appliances => 'Appliance-1',
} }
end end