openstack
/
puppet-cinder
Code Issues Proposed changes

Remove deprecated cinder::backend::dellemc_xtremio_iscsi 

cinder::backend::dellemc_xtremio_iscsi is deprecated and should
have been removed in Victoria release.

Change-Id: I7c0473881b5065fdfacda8a327f02f12074b9b96
This commit is contained in:
Ivan Pchelintsev 2021-04-13 11:36:10 +03:00
parent 930d112c8e
commit 92019855a7
3 changed files with 5 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
manifests/backend/dellemc_xtremio_iscsi.pp
View File

@ -1,103 +0,0 @@
# == define: cinder::backend::dellemc_xtremio_iscsi
#
# Configure the Dell EMC XtremIO Driver for cinder.
#
# === Parameters
#
# [*san_ip*]
# (required) IP address of XMS.
#
# [*san_login*]
# (required) XMS user name.
#
# [*san_password*]
# (required) XMS user password.
#
# [*xtremio_cluster_name*]
# (required) XMS cluster id in multi-cluster environment.
#
# [*volume_backend_name*]
# (optional) The storage backend name.
# Defaults to the name of the backend
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*xtremio_array_busy_retry_count*]
# (optional) Number of retries in case array is busy.
# Defaults to 5
#
# [*xtremio_array_busy_retry_interval*]
# (optional) Interval between retries in case array is busy.
# Defaults to 5
#
# [*xtremio_volumes_per_glance_cache*]
# (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: {}
# Example:
# { 'dellemc_xtremio_iscsi_backend/param1' => { 'value' => value1 } }
#
# [*manage_volume_type*]
# (Optional) Whether or not manage Cinder Volume type.
# If set to true, a Cinder Volume type will be created
# with volume_backend_name=$volume_backend_name key/value.
# Defaults to false.
#
define cinder::backend::dellemc_xtremio_iscsi (
$san_ip,
$san_login,
$san_password,
$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,
$manage_volume_type = false,
$xtremio_ports = $::os_service_default,
$extra_options = {},
) {
include cinder::deps
warning('The cinder::backend::dellemc_xtremio_iscsi is deprecated and will be removed in V-release, \
please use cinder::backend::dellemc_xtremio resource instead.')
$driver = 'dell_emc.xtremio.XtremIOISCSIDriver'
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/volume_driver": value => "cinder.volume.drivers.${driver}";
"${name}/san_ip": value => $san_ip;
"${name}/san_login": value => $san_login;
"${name}/san_password": value => $san_password, secret => true;
"${name}/xtremio_cluster_name": value => $xtremio_cluster_name;
"${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;
}
if $manage_volume_type {
cinder_type { $volume_backend_name:
ensure => present,
properties => ["volume_backend_name=${volume_backend_name}"],
}
}
create_resources('cinder_config', $extra_options)
}

5
releasenotes/notes/xtremio-iscsi-remove-deprecated-01fc5f2d63b0fdb7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Remove deprecated cinder::backend::dellemc_xtremio_iscsi. Use
cinder::backend::dellemc_xtremio instead.

98
spec/defines/cinder_backend_dellemc_xtremio_spec.rb
View File

@ -1,98 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::dellemc_xtremio_iscsi' do
let (:config_group_name) { 'dellemc_xtremio_iscsi' }
let (:title) { config_group_name }
let :params do
{
:san_ip => '172.23.8.101',
:san_login => 'Admin',
:san_password => '12345',
:xtremio_cluster_name => 'Cluster01',
}
end
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_ports => '<SERVICE DEFAULT>',
}
end
let :custom_params 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_ports => '10.10.57.45,10.10.57.46',
}
end
shared_examples 'dellemc_xtremio_iscsi volume driver' do
let :params_hash do
default_params.merge(params)
end
it {
is_expected.to contain_cinder__backend__dellemc_xtremio_iscsi(config_group_name)
is_expected.to contain_cinder_config("#{title}/volume_driver").with_value('cinder.volume.drivers.dell_emc.xtremio.XtremIOISCSIDriver')
}
it {
params_hash.each_pair do |config,value|
is_expected.to contain_cinder_config("#{config_group_name}/#{config}").with_value( value )
end
}
end
shared_examples 'cinder::backend::dellemc_xtremio_iscsi' do
context 'with default parameters' do
it_behaves_like 'dellemc_xtremio_iscsi volume driver'
end
context 'with custom parameters' do
before do
params.merge(custom_params)
end
it_behaves_like 'dellemc_xtremio_iscsi volume driver'
end
context 'dellemc_xtremio_iscsi backend with additional configuration' do
before do
params.merge!( :extra_options => {'dellemc_xtremio_iscsi/param1' => { 'value' => 'value1' }} )
end
it { is_expected.to contain_cinder_config('dellemc_xtremio_iscsi/param1').with_value('value1') }
end
context 'dellemc_xtremio_iscsi backend with cinder type' do
before do
params.merge!({:manage_volume_type => true})
end
it { is_expected.to contain_cinder_type('dellemc_xtremio_iscsi').with(
:ensure => 'present',
:properties => ['volume_backend_name=dellemc_xtremio_iscsi']
)}
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'cinder::backend::dellemc_xtremio_iscsi'
end
end
end