openstack
/
puppet-cinder
Code Issues Proposed changes

Remove deprecated Dell EMC volume drivers 

This change removes support for the following three volume drivers
which were deprecated during past cycle because of rebranding.
 - Dell EMC ScaleIO
 - Dell EMC VxFlexOS
 - Dell EMC VMAX

Depends-on: https://review.opendev.org/823911
Change-Id: Ib1ed015446f2e229a75bdd21c02cb587a91b5485
This commit is contained in:
Takashi Kajinami 2022-01-12 09:08:22 +09:00
parent a2b6b74266
commit c6b83e5a9b
7 changed files with 8 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
manifests/backend/dellemc_vmax_iscsi.pp
View File

@ -1,72 +0,0 @@
#
# == Define: cinder::backend::dellemc_vmax_iscsi
#
# Setup Cinder to use the Dell EMC VMAX ISCSI Driver
# Compatible for multiple backends
#
# == Parameters
#
# [*volume_backend_name*]
# (optional) Allows for the volume_backend_name to be separate of $name.
# Defaults to: $name
#
# [*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.
#
# [*cinder_emc_config_file*]
# (required) File path of Dell EMC VMAX ISCSI specific configuration file.
#
# [*volume_driver*]
# (optional) The Dell EMC VMAX ISCSI Driver
# Defaults to cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver
#
# [*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.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
# Example :
# { 'dellemc_vmax_iscsi_backend/param1' => { 'value' => value1 } }#
#
define cinder::backend::dellemc_vmax_iscsi (
$cinder_emc_config_file,
$volume_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$extra_options = {},
$volume_driver = 'cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver',
$manage_volume_type = false,
) {
include cinder::deps
warning('The cinder::backend::dellemc_vmax_iscsi is not supported, please use cinder::backend::dellemc_powermax resource instead.')
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/volume_driver": value => $volume_driver;
"${name}/cinder_emc_config_file": value => $cinder_emc_config_file;
}
if $manage_volume_type {
cinder_type { $volume_backend_name:
ensure => present,
properties => ["volume_backend_name=${volume_backend_name}"],
}
}
ensure_packages( 'pywbem', {
ensure => present,
name => $::cinder::params::pywbem_package_name,
tag => 'cinder-support-package'})
create_resources('cinder_config', $extra_options)
}

154
manifests/backend/dellemc_vxflexos.pp
View File

@ -1,154 +0,0 @@
# == define: cinder::backend::dellemc_vxflexos
#
# Configures Cinder to use the Dell EMC VxFlexOS Block Storage driver
# Compatible for multiple backends
#
# === Parameters
#
# [*san_login*]
# (required) Administrative user account name used to access the storage
# system or proxy server.
#
# [*san_password*]
# (required) Password for the administrative user account specified in the
# san_login option.
#
# [*san_ip*]
# (required) The hostname (or IP address) for the storage system or proxy
# server.
#
# [*vxflexos_storage_pools*]
# (String) (required) Storage Pools. Comma separated list of storage pools used to provide volumes.
# Each pool should be specified as a protection_domain_name:storage_pool_name value
#
# [*volume_backend_name*]
# (optional) The name of the cinder::backend::dellemc_vxflexos resource
# Defaults to $name.
#
# [*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.
#
# [*vxflexos_allow_migration_during_rebuild*]
# (optional) (Boolean) Allow volume migration during rebuild.
# Defaults to $::os_service_default
#
# [*vxflexos_allow_non_padded_volumes*]
# (optional) (Boolean) Allow volumes to be created in Storage Pools
# when zero padding is disabled.
# Defaults to $::os_service_default
#
# [*vxflexos_max_over_subscription_ratio*]
# (optional) (Floating point) max_over_subscription_ratio setting for the driver.
# Maximum value allowed is 10.0.
# Defaults to $::os_service_default
#
# [*vxflexos_rest_server_port*]
# (optional) (String) The TCP port to use for communication with the storage
# system or proxy.
# Defaults to $::os_service_default
#
# [*vxflexos_round_volume_capacity*]
# (optional) (Boolean) Round volume sizes up to 8GB boundaries. VxFlex OS/ScaleIO
# requires volumes to be sized in multiples of 8GB. If set to False,
# volume creation will fail for volumes not sized properly
# Defaults to $::os_service_default
#
# [*vxflexos_server_api_version*]
# (optional) (String) VxFlex OS/ScaleIO API version. This value should be left as the
# default value unless otherwise instructed by technical support.
#
# [*vxflexos_unmap_volume_before_deletion*]
# (optional) (Boolean) Unmap volumes before deletion.
# Defaults to $::os_service_default
#
# [*san_thin_provision*]
# (optional) (Boolean) Wheater to use thin provisioning or not.
# Defaults to $::os_service_default
#
# [*driver_ssl_cert_verify*]
# (optional) Verify the server certificate
# Defaults to $::os_service_default
#
# [*driver_ssl_cert_path*]
# (optional) Server certificate path.
# Defaults to $::os_service_default
#
# [*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.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
# Example :
# { 'vxflexos_backend/param1' => { 'value' => value1 } }
#
# === Examples
#
# cinder::backend::dellemc_vxflexos { 'myBackend':
# san_login => 'admin',
# san_password => 'password',
# san_ip => 'dellemc_vxflexos.mycorp.com',
# vxflexos_storage_pools => 'domain1:pool1',
# }
#
define cinder::backend::dellemc_vxflexos(
$san_login,
$san_password,
$san_ip,
$vxflexos_storage_pools,
$volume_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$vxflexos_allow_migration_during_rebuild = $::os_service_default,
$vxflexos_allow_non_padded_volumes = $::os_service_default,
$vxflexos_max_over_subscription_ratio = $::os_service_default,
$vxflexos_rest_server_port = $::os_service_default,
$vxflexos_round_volume_capacity = $::os_service_default,
$vxflexos_server_api_version = $::os_service_default,
$vxflexos_unmap_volume_before_deletion = $::os_service_default,
$san_thin_provision = $::os_service_default,
$driver_ssl_cert_verify = $::os_service_default,
$driver_ssl_cert_path = $::os_service_default,
$manage_volume_type = false,
$extra_options = {},
) {
include cinder::deps
warning('The cinder::backend::dellemc_vxflexos is rebranded and deprecated. It will be removed \
in W-release, please use cinder::backend::dellemc_powerflex resource instead.')
cinder_config {
"${name}/volume_driver": value => 'cinder.volume.drivers.dell_emc.vxflexos.driver.VxFlexOSDriver';
"${name}/san_login": value => $san_login;
"${name}/san_password": value => $san_password, secret => true;
"${name}/san_ip": value => $san_ip;
"${name}/vxflexos_storage_pools": value => $vxflexos_storage_pools;
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/vxflexos_allow_migration_during_rebuild": value => $vxflexos_allow_migration_during_rebuild;
"${name}/vxflexos_allow_non_padded_volumes": value => $vxflexos_allow_non_padded_volumes;
"${name}/vxflexos_max_over_subscription_ratio": value => $vxflexos_max_over_subscription_ratio;
"${name}/vxflexos_rest_server_port": value => $vxflexos_rest_server_port;
"${name}/vxflexos_round_volume_capacity": value => $vxflexos_round_volume_capacity;
"${name}/vxflexos_server_api_version": value => $vxflexos_server_api_version;
"${name}/vxflexos_unmap_volume_before_deletion": value => $vxflexos_unmap_volume_before_deletion;
"${name}/san_thin_provision": value => $san_thin_provision;
"${name}/driver_ssl_cert_verify": value => $driver_ssl_cert_verify;
"${name}/driver_ssl_cert_path": value => $driver_ssl_cert_path;
}
if $manage_volume_type {
cinder_type { $name:
ensure => present,
properties => ["volume_backend_name=${name}"],
}
}
create_resources('cinder_config', $extra_options)
}

163
manifests/backend/scaleio.pp
View File

@ -1,163 +0,0 @@
# == define: cinder::backend::scaleio
#
# Configures Cinder to use the EMC ScaleIO Block Storage driver
# Compatible for multiple backends
#
# === Parameters
#
# [*volume_backend_name*]
# (optional) The name of the cinder::backend::scaleio ressource
# Defaults to $name.
#
# [*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.
#
# [*sio_login*]
# (required) Administrative user account name used to access the storage
# system or proxy server.
#
# [*sio_password*]
# (required) Password for the administrative user account specified in the
# sio_login option.
#
# [*sio_server_hostname*]
# (required) The hostname (or IP address) for the storage system or proxy
# server.
#
# [*sio_server_port*]
# (optional) The TCP port to use for communication with the storage
# system or proxy.
# Defaults to $::os_service_default
#
# [*sio_verify_server_certificate*]
# (optional) Verify the server certificate
# Defaults to $::os_service_default
#
# [*sio_server_certificate_path*]
# (optional) Server certificate path.
# Defaults to $::os_service_default
#
# [*sio_protection_domain_id*]
# (String) Protection Domain ID.
#
# [*sio_protection_domain_name*]
# (String) Protection Domain name.
#
# [*sio_storage_pool_id*]
# (String) Storage Pool ID.
#
# [*sio_storage_pool_name*]
# (String) Storage Pool name.
#
# [*sio_storage_pools*]
# (String) Storage Pools.
#
# [*sio_round_volume_capacity*]
# (Boolean) Round up volume capacity.
# Defaults to $::os_service_default
#
# [*sio_unmap_volume_before_deletion*]
# (optionla) (Boolean) Unmap volume before deletion.
# Defaults to $::os_service_default
#
# [*sio_max_over_subscription_ratio*]
# (optional) (Floating point) max_over_subscription_ratio settinG
# for the ScaleIO driver. This replaces the general
# max_over_subscription_ratio which has no effect in this driver.
# Maximum value allowed for ScaleIO is 10.0.
# Defaults to $::os_service_default
#
# [*sio_thin_provision*]
# (optional) (Boolean) Wheater to use thin provisioning or not.
# Defaults to $::os_service_default
#
# [*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.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
# Example :
# { 'sio_backend/param1' => { 'value' => value1 } }
#
# === Examples
#
# cinder::backend::scaleio { 'myBackend':
# sio_login => 'admin',
# sio_password => 'password',
# sio_server_hostname => 'scaleio.mycorp.com',
# sio_protection_domain_name => 'domain1',
# sio_storage_pool_name => 'pool1',
# sio_storage_pools => 'domain1:pool1',
# }
#
# === Authors
#
# Harald Jensas <hjensas@redhat.com>
#
# === Copyright
#
# Copyright 2016 Red Hat, Inc.
#
define cinder::backend::scaleio (
$sio_login,
$sio_password,
$sio_server_hostname,
$sio_protection_domain_id,
$sio_protection_domain_name,
$sio_storage_pool_id,
$sio_storage_pool_name,
$sio_storage_pools,
$volume_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$sio_server_port = $::os_service_default,
$sio_verify_server_certificate = $::os_service_default,
$sio_server_certificate_path = $::os_service_default,
$sio_round_volume_capacity = $::os_service_default,
$sio_unmap_volume_before_deletion = $::os_service_default,
$sio_max_over_subscription_ratio = $::os_service_default,
$sio_thin_provision = $::os_service_default,
$manage_volume_type = false,
$extra_options = {},
) {
warning('The cinder::backend::sclaeio is deprecated and will be removed in W-release, \
please use cinder::backend::dellemc_vxflexos resource instead.')
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.dell_emc.scaleio.driver.ScaleIODriver';
"${name}/san_login": value => $sio_login;
"${name}/san_password": value => $sio_password, secret => true;
"${name}/san_ip": value => $sio_server_hostname;
"${name}/sio_rest_server_port": value => $sio_server_port;
"${name}/sio_verify_server_certificate": value => $sio_verify_server_certificate;
"${name}/sio_server_certificate_path": value => $sio_server_certificate_path;
"${name}/sio_protection_domain_id": value => $sio_protection_domain_id;
"${name}/sio_protection_domain_name": value => $sio_protection_domain_name;
"${name}/sio_storage_pool_id": value => $sio_storage_pool_id;
"${name}/sio_storage_pool_name": value => $sio_storage_pool_name;
"${name}/sio_storage_pools": value => $sio_storage_pools;
"${name}/sio_round_volume_capacity": value => $sio_round_volume_capacity;
"${name}/sio_unmap_volume_before_deletion": value => $sio_unmap_volume_before_deletion;
"${name}/sio_max_over_subscription_ratio": value => $sio_max_over_subscription_ratio;
"${name}/san_thin_provision": value => $sio_thin_provision;
}
if $manage_volume_type {
cinder_type { $name:
ensure => present,
properties => ["volume_backend_name=${name}"],
}
}
create_resources('cinder_config', $extra_options)
}

8
releasenotes/notes/dellemc-driver-cleanup-7c8f149c4b71ce4b.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The following resource types have been removed.
- ``cinder::backend::scaleio``
- ``cinder::backend::dellemc_vxflexos``
- ``cinder::backend::dellemc_vmax_iscsi``

65
spec/defines/cinder_backend_dellemc_vmax_spec.rb
View File

@ -1,65 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::dellemc_vmax_iscsi' do
let (:title) { 'dellemc_vmax_iscsi' }
let :req_params do
{
:cinder_emc_config_file => '/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml',
:volume_backend_name => 'dellemc_vmax_iscsi',
}
end
let :params do
req_params
end
shared_examples 'cinder::backend::dellemc_vmax_iscsi' do
context 'dell emc vmax iscsi volume driver' do
it {
is_expected.to contain_package('pywbem').with_ensure('installed')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
}
end
context 'dell emc vmax iscsi backend overriding some parameters' do
before :each do
params.merge!({
:backend_availability_zone => 'my_zone',
:manage_volume_type => true,
})
end
it {
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/backend_availability_zone').with_value('my_zone')
}
it { is_expected.to contain_cinder_type('dellemc_vmax_iscsi').with(
:ensure => 'present',
:properties => ['volume_backend_name=dellemc_vmax_iscsi']
)}
end
context 'dell emc vmax iscsi backend with additional configuration' do
before :each do
params.merge!( :extra_options => {'dellemc_vmax_iscsi/param1' => {'value' => 'value1'}} )
end
it { is_expected.to contain_cinder_config('dellemc_vmax_iscsi/param1').with_value('value1') }
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_vmax_iscsi'
end
end
end

89
spec/defines/cinder_backend_dellemc_vxflexos_spec.rb
View File

@ -1,89 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::dellemc_vxflexos' do
let (:title) { 'vxflexos' }
let :params1 do
{
:san_login => 'admin',
:san_password => 'password',
:san_ip => 'vxflexos.example.com',
:vxflexos_rest_server_port => '443',
:manage_volume_type => true,
:san_thin_provision => false,
}
end
let :params2 do
{
:backend_availability_zone => 'my_zone',
:vxflexos_allow_migration_during_rebuild => 'true',
:vxflexos_allow_non_padded_volumes => 'false',
:vxflexos_max_over_subscription_ratio => '6.0',
:vxflexos_round_volume_capacity => true,
:vxflexos_server_api_version => '3.5',
:vxflexos_storage_pools => 'domain1:pool1,domain2:pool2',
:vxflexos_unmap_volume_before_deletion => false,
:driver_ssl_cert_path => '/path/cert.pem',
:driver_ssl_cert_verify => true,
}
end
let :params do
params1.merge(params2)
end
shared_examples 'cinder::backend::dellemc_vxflexos' do
context 'vxflexos volume driver' do
it { is_expected.to contain_cinder_config("#{title}/volume_driver").with(
:value => 'cinder.volume.drivers.dell_emc.vxflexos.driver.VxFlexOSDriver'
)}
it {
is_expected.to contain_cinder_config("#{title}/san_login").with_value('admin')
is_expected.to contain_cinder_config("#{title}/san_ip").with_value('vxflexos.example.com')
is_expected.to contain_cinder_config("#{title}/san_thin_provision").with_value('false')
is_expected.to contain_cinder_config("#{title}/vxflexos_rest_server_port").with_value('443')
}
it {
params2.each_pair do |config,value|
is_expected.to contain_cinder_config("#{title}/#{config}").with_value(value)
end
}
it { is_expected.to contain_cinder_config("#{title}/san_password").with_secret(true) }
end
context 'vxflexos backend with additional configuration' do
before :each do
params.merge!( :extra_options => {"#{title}/param1" => {'value' => 'value1'}} )
end
it { is_expected.to contain_cinder_config("#{title}/param1").with_value('value1') }
end
context 'vxflexos backend with cinder type' do
before :each do
params.merge!( :manage_volume_type => true )
end
it { is_expected.to contain_cinder_type("#{title}").with(
:ensure => 'present',
:properties => ["volume_backend_name=#{title}"]
)}
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_vxflexos'
end
end
end

90
spec/defines/cinder_backend_scaleio_spec.rb
View File

@ -1,90 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::scaleio' do
let (:title) { 'scaleio' }
let :params1 do
{
:sio_login => 'admin',
:sio_password => 'password',
:sio_server_hostname => 'scaleio.example.com',
:sio_server_port => '443',
:manage_volume_type => true,
:sio_thin_provision => false,
}
end
let :params2 do
{
:backend_availability_zone => 'my_zone',
:sio_server_certificate_path => '/path/cert.pem',
:sio_max_over_subscription_ratio => '6.0',
:sio_verify_server_certificate => true,
:sio_storage_pool_id => 'poolid1',
:sio_storage_pools => 'domain1:pool1,domain2:pool2',
:sio_storage_pool_name => 'pool1',
:sio_protection_domain_id => 'domainid1',
:sio_protection_domain_name => 'domain1',
:sio_unmap_volume_before_deletion => false,
:sio_round_volume_capacity => true,
}
end
let :params do
params1.merge(params2)
end
shared_examples 'cinder::backend::scaleio' do
context 'scaleio volume driver' do
it { is_expected.to contain_cinder_config("#{title}/volume_driver").with(
:value => 'cinder.volume.drivers.dell_emc.scaleio.driver.ScaleIODriver'
)}
it {
is_expected.to contain_cinder_config("#{title}/san_login").with_value('admin')
is_expected.to contain_cinder_config("#{title}/san_ip").with_value('scaleio.example.com')
is_expected.to contain_cinder_config("#{title}/san_thin_provision").with_value('false')
is_expected.to contain_cinder_config("#{title}/sio_rest_server_port").with_value('443')
}
it {
params2.each_pair do |config,value|
is_expected.to contain_cinder_config("#{title}/#{config}").with_value(value)
end
}
it { is_expected.to contain_cinder_config("#{title}/san_password").with_secret(true) }
end
context 'scaleio backend with additional configuration' do
before :each do
params.merge!( :extra_options => {"#{title}/param1" => {'value' => 'value1'}} )
end
it { is_expected.to contain_cinder_config("#{title}/param1").with_value('value1') }
end
context 'scaleio backend with cinder type' do
before :each do
params.merge!( :manage_volume_type => true )
end
it { is_expected.to contain_cinder_type("#{title}").with(
:ensure => 'present',
:properties => ["volume_backend_name=#{title}"]
)}
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::scaleio'
end
end
end