From 92019855a7bc5a2c49eee9dd14caaac384a8300a Mon Sep 17 00:00:00 2001 From: Ivan Pchelintsev Date: Tue, 13 Apr 2021 11:36:10 +0300 Subject: [PATCH] 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 --- manifests/backend/dellemc_xtremio_iscsi.pp | 103 ------------------ ...si-remove-deprecated-01fc5f2d63b0fdb7.yaml | 5 + .../cinder_backend_dellemc_xtremio_spec.rb | 98 ----------------- 3 files changed, 5 insertions(+), 201 deletions(-) delete mode 100644 manifests/backend/dellemc_xtremio_iscsi.pp create mode 100644 releasenotes/notes/xtremio-iscsi-remove-deprecated-01fc5f2d63b0fdb7.yaml delete mode 100644 spec/defines/cinder_backend_dellemc_xtremio_spec.rb diff --git a/manifests/backend/dellemc_xtremio_iscsi.pp b/manifests/backend/dellemc_xtremio_iscsi.pp deleted file mode 100644 index ccd1f993..00000000 --- a/manifests/backend/dellemc_xtremio_iscsi.pp +++ /dev/null @@ -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) - -} diff --git a/releasenotes/notes/xtremio-iscsi-remove-deprecated-01fc5f2d63b0fdb7.yaml b/releasenotes/notes/xtremio-iscsi-remove-deprecated-01fc5f2d63b0fdb7.yaml new file mode 100644 index 00000000..c98bb5fd --- /dev/null +++ b/releasenotes/notes/xtremio-iscsi-remove-deprecated-01fc5f2d63b0fdb7.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Remove deprecated cinder::backend::dellemc_xtremio_iscsi. Use + cinder::backend::dellemc_xtremio instead. diff --git a/spec/defines/cinder_backend_dellemc_xtremio_spec.rb b/spec/defines/cinder_backend_dellemc_xtremio_spec.rb deleted file mode 100644 index 48203ba0..00000000 --- a/spec/defines/cinder_backend_dellemc_xtremio_spec.rb +++ /dev/null @@ -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 => '', - :xtremio_array_busy_retry_count => 5, - :xtremio_array_busy_retry_interval => 5, - :xtremio_volumes_per_glance_cache => 100, - :xtremio_ports => '', - } - 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