From 74a0e3dc696abe6684a273ae38ce0d4764116cfb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 12 Jan 2023 11:17:41 +0900 Subject: [PATCH] Remove support for DELL SC volume driver The driver was deprecated long ago in favor of rebranding to DELL EMC SC volume driver[1]. [1] 3816fab9be08ee5bfb2af49cd5fcb59bba9aa6c6 Change-Id: Ifd6cd08fc9a38a7818a016374a50f04d2342b413 --- manifests/backend/dellsc_iscsi.pp | 160 ------------------ .../remove-dellsc_iscsi-5d185d574d75b8f6.yaml | 5 + .../cinder_backend_dellsc_iscsi_spec.rb | 110 ------------ 3 files changed, 5 insertions(+), 270 deletions(-) delete mode 100644 manifests/backend/dellsc_iscsi.pp create mode 100644 releasenotes/notes/remove-dellsc_iscsi-5d185d574d75b8f6.yaml delete mode 100644 spec/defines/cinder_backend_dellsc_iscsi_spec.rb diff --git a/manifests/backend/dellsc_iscsi.pp b/manifests/backend/dellsc_iscsi.pp deleted file mode 100644 index 8c77366c..00000000 --- a/manifests/backend/dellsc_iscsi.pp +++ /dev/null @@ -1,160 +0,0 @@ -# == define: cinder::backend::dellsc_iscsi -# -# Configure the Dell Storage Center ISCSI Driver for cinder. -# -# === Parameters -# -# [*san_ip*] -# (required) IP address of Enterprise Manager. -# -# [*san_login*] -# (required) Enterprise Manager user name. -# -# [*san_password*] -# (required) Enterprise Manager user password. -# -# [*dell_sc_ssn*] -# (required) The Storage Center serial number to use. -# -# [*target_ip_address*] -# (optional) The IP address that the iSCSI daemon is listening on. -# Defaults to undef. -# -# [*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. -# -# [*dell_sc_api_port*] -# (optional) The Enterprise Manager API port. -# Defaults to $::os_service_default -# -# [*dell_sc_server_folder*] -# (optional) Name of the server folder to use on the Storage Center. -# Defaults to 'srv' -# -# [*dell_sc_verify_cert*] -# (optional) Enable HTTPS SC certificate verification -# Defaults to $::os_service_default -# -# [*dell_sc_volume_folder*] -# (optional) Name of the volume folder to use on the Storage Center. -# Defaults to 'vol' -# -# [*target_port*] -# (optional) The ISCSI IP Port of the Storage Center. -# Defaults to $::os_service_default -# -# [*excluded_domain_ips*] -# (optional)Comma separated list of domain IPs to be excluded from -# iSCSI returns of Storage Center. -# Defaults to $::os_service_default -# -# [*secondary_san_ip*] -# (optional) IP address of secondary DSM controller. -# Defaults to $::os_service_default -# -# [*secondary_san_login*] -# (optional) Secondary DSM user name. -# Defaults to $::os_service_default -# -# [*secondary_san_password*] -# (optional) Secondary DSM user password. -# Defaults to $::os_service_default -# -# [*secondary_sc_api_port*] -# (optional) Secondary Dell API port. -# Defaults to $::os_service_default -# -# [*extra_options*] -# (optional) Hash of extra options to pass to the backend stanza. -# Defaults to: {} -# Example: -# { 'dellsc_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. -# -# [*use_multipath_for_image_xfer*] -# (Optional) Enables multipath configuration. -# Defaults to true. -# -define cinder::backend::dellsc_iscsi ( - $san_ip, - $san_login, - $san_password, - $dell_sc_ssn, - $target_ip_address = undef, - $volume_backend_name = $name, - $backend_availability_zone = $::os_service_default, - $dell_sc_api_port = $::os_service_default, - $dell_sc_server_folder = 'srv', - $dell_sc_verify_cert = $::os_service_default, - $dell_sc_volume_folder = 'vol', - $target_port = $::os_service_default, - $excluded_domain_ips = $::os_service_default, - $secondary_san_ip = $::os_service_default, - $secondary_san_login = $::os_service_default, - $secondary_san_password = $::os_service_default, - $secondary_sc_api_port = $::os_service_default, - $manage_volume_type = false, - $use_multipath_for_image_xfer = true, - $extra_options = {}, -) { - - include cinder::deps - - warning('The cinder::backend::dellsc_iscsi is deprecated and will be removed in V-release, \ -please use cinder::backend::dellemc_sc resource instead.') - - if $dell_sc_server_folder == 'srv' { - warning("The OpenStack default value of dell_sc_server_folder differs from the puppet module \ -default of \"srv\" and will be changed to the upstream OpenStack default in N-release.") - } - - if $dell_sc_volume_folder == 'vol' { - warning("The OpenStack default value of dell_sc_volume_folder differs from the puppet module \ -default of \"vol\" and will be changed to the upstream OpenStack default in N-release.") - } - - $driver = 'dell_emc.sc.storagecenter_iscsi.SCISCSIDriver' - 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}/target_ip_address": value => $target_ip_address; - "${name}/dell_sc_ssn": value => $dell_sc_ssn; - "${name}/dell_sc_api_port": value => $dell_sc_api_port; - "${name}/dell_sc_server_folder": value => $dell_sc_server_folder; - "${name}/dell_sc_verify_cert": value => $dell_sc_verify_cert; - "${name}/dell_sc_volume_folder": value => $dell_sc_volume_folder; - "${name}/target_port": value => $target_port; - "${name}/excluded_domain_ips": value => $excluded_domain_ips; - "${name}/secondary_san_ip": value => $secondary_san_ip; - "${name}/secondary_san_login": value => $secondary_san_login; - "${name}/secondary_san_password": value => $secondary_san_password, secret => true; - "${name}/secondary_sc_api_port": value => $secondary_sc_api_port; - "${name}/use_multipath_for_image_xfer": value => $use_multipath_for_image_xfer; - } - - if $manage_volume_type { - cinder_type { $volume_backend_name: - ensure => present, - properties => ["volume_backend_name=${volume_backend_name}"], - } - } - - create_resources('cinder_config', $extra_options) - -} diff --git a/releasenotes/notes/remove-dellsc_iscsi-5d185d574d75b8f6.yaml b/releasenotes/notes/remove-dellsc_iscsi-5d185d574d75b8f6.yaml new file mode 100644 index 00000000..22f65f0c --- /dev/null +++ b/releasenotes/notes/remove-dellsc_iscsi-5d185d574d75b8f6.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``cinder::backend::dellsc_iscsi`` defined resource type has been + removed. diff --git a/spec/defines/cinder_backend_dellsc_iscsi_spec.rb b/spec/defines/cinder_backend_dellsc_iscsi_spec.rb deleted file mode 100644 index b631ca6b..00000000 --- a/spec/defines/cinder_backend_dellsc_iscsi_spec.rb +++ /dev/null @@ -1,110 +0,0 @@ -require 'spec_helper' - -describe 'cinder::backend::dellsc_iscsi' do - let (:config_group_name) { 'dellsc_iscsi' } - - let (:title) { config_group_name } - - let :params do - { - :san_ip => '172.23.8.101', - :san_login => 'Admin', - :san_password => '12345', - :target_ip_address => '192.168.0.20', - :dell_sc_ssn => '64720', - } - end - - let :default_params do - { - :backend_availability_zone => '', - :dell_sc_api_port => '', - :dell_sc_server_folder => 'srv', - :dell_sc_verify_cert => '', - :dell_sc_volume_folder => 'vol', - :target_port => '', - :excluded_domain_ips => '', - :secondary_san_ip => '', - :secondary_san_login => '', - :secondary_san_password => '', - :secondary_sc_api_port => '', - :use_multipath_for_image_xfer => 'true', - } - end - - let :custom_params do - { - :backend_availability_zone => 'my_zone', - :dell_sc_api_port => 111, - :dell_sc_server_folder => 'other_srv', - :dell_sc_verify_cert => true, - :dell_sc_volume_folder => 'other_vol', - :target_port => 222, - :secondary_san_ip => '127.0.0.3', - :secondary_san_login => 'Foo', - :secondary_san_password => 'Bar', - :secondary_sc_api_port => 333, - } - end - - shared_examples 'dellsc_iscsi volume driver' do - let :params_hash do - default_params.merge(params) - end - - it { is_expected.to contain_cinder__backend__dellsc_iscsi(config_group_name) } - - it { - params_hash.each_pair do |config,value| - is_expected.to contain_cinder_config("#{config_group_name}/#{config}").with_value( value ) - end - } - - it { - is_expected.to contain_cinder_config("#{config_group_name}/volume_driver").with_value('cinder.volume.drivers.dell_emc.sc.storagecenter_iscsi.SCISCSIDriver') - is_expected.to contain_cinder_config("#{config_group_name}/use_multipath_for_image_xfer").with_value('true') - } - end - - shared_examples 'cinder::backend::dellsc_iscsi' do - context 'with default parameters' do - it_behaves_like 'dellsc_iscsi volume driver' - end - - context 'with custom parameters' do - before do - params.merge(custom_params) - end - - it_behaves_like 'dellsc_iscsi volume driver' - end - - context 'dellsc_iscsi backend with additional configuration' do - before do - params.merge!({:extra_options => {'dellsc_iscsi/param1' => { 'value' => 'value1' }}}) - end - - it { is_expected.to contain_cinder_config('dellsc_iscsi/param1').with_value('value1') } - end - - context 'dellsc_iscsi backend with cinder type' do - before do - params.merge!({:manage_volume_type => true}) - end - - it { is_expected.to contain_cinder_type('dellsc_iscsi').with(:ensure => :present, :properties => ['volume_backend_name=dellsc_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::dellsc_iscsi' - end - end -end