From 09aa7180892271d7161d7a317b63f2f7605fd2f6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 23 Apr 2021 00:14:10 +0900 Subject: [PATCH] Remove support for Nexenta Edge Driver ... because it was deprecated during Victoria cycle[1]. [1] 38e35eddacf39be7a9474da6a622bda69851a5fb Change-Id: Ia2f7aa9d99557038147ef5573bcc2a96084cfd12 --- manifests/backend/nexenta_edge.pp | 104 ------------------ .../remove-nexenta-edge-bd90249388eae3b0.yaml | 4 + .../cinder_backend_nexenta_edge_spec.rb | 70 ------------ 3 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 manifests/backend/nexenta_edge.pp create mode 100644 releasenotes/notes/remove-nexenta-edge-bd90249388eae3b0.yaml delete mode 100644 spec/defines/cinder_backend_nexenta_edge_spec.rb diff --git a/manifests/backend/nexenta_edge.pp b/manifests/backend/nexenta_edge.pp deleted file mode 100644 index 8f87d5e7..00000000 --- a/manifests/backend/nexenta_edge.pp +++ /dev/null @@ -1,104 +0,0 @@ -# == Class: cinder::backend::nexenta_edge -# -# DEPRECATED! -# Setups Cinder with Nexenta Edge volume driver. -# -# === Parameters -# -# [*nexenta_rest_user*] -# (required) User name to connect to Nexenta Edge. -# -# [*nexenta_rest_password*] -# (required) Password to connect to Nexenta Edge. -# -# [*nexenta_rest_address*] -# (required) IP address of Nexenta Edge. -# -# [*nexenta_client_address*] -# (required) iSCSI Gateway client. -# -# [*nexenta_rest_port*] -# (optional) HTTP port of Nexenta Edge. -# Defaults to '8080'. -# -# [*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. -# -# [*nexenta_lun_container*] -# (optional) Logical path of bucket for LUNs. -# Defaults to 'cinder'. -# -# [*nexenta_iscsi_service*] -# (optional) iSCSI service name. -# Defaults to 'cinder'. -# -# [*nexenta_chunksize*] -# (optional) Chunk size for volumes. -# Defaults to '32768'. -# -# [*volume_driver*] -# (required) Nexenta driver to use. -# Defaults to: 'cinder.volume.drivers.nexenta.nexentaedge.iscsi.NexentaEdgeISCSIDriver'. -# -# [*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 : -# { 'nexenta_backend/param1' => { 'value' => value1 } } -# -define cinder::backend::nexenta_edge ( - $nexenta_rest_user, - $nexenta_rest_password, - $nexenta_rest_address, - $nexenta_client_address, - $nexenta_rest_port = '8080', - $volume_backend_name = $name, - $backend_availability_zone = $::os_service_default, - $nexenta_lun_container = 'cinder', - $nexenta_iscsi_service = 'cinder', - $nexenta_chunksize = '32768', - $volume_driver = 'cinder.volume.drivers.nexenta.nexentaedge.iscsi.NexentaEdgeISCSIDriver', - $manage_volume_type = false, - $extra_options = {}, -) { - - warning('Support for Nexenta Edge Driver has been deprecated and will be removed \ -in a future release') - - cinder_config { - "${name}/volume_backend_name": value => $volume_backend_name; - "${name}/backend_availability_zone": value => $backend_availability_zone; - "${name}/nexenta_rest_user": value => $nexenta_rest_user; - "${name}/nexenta_rest_password": value => $nexenta_rest_password, secret => true; - "${name}/nexenta_rest_address": value => $nexenta_rest_address; - "${name}/nexenta_client_address": value => $nexenta_client_address; - "${name}/nexenta_rest_port": value => $nexenta_rest_port; - "${name}/nexenta_lun_container": value => $nexenta_lun_container; - "${name}/nexenta_iscsi_service": value => $nexenta_iscsi_service; - "${name}/nexenta_chunksize": value => $nexenta_chunksize; - "${name}/volume_driver": value => $volume_driver; - } - - 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-nexenta-edge-bd90249388eae3b0.yaml b/releasenotes/notes/remove-nexenta-edge-bd90249388eae3b0.yaml new file mode 100644 index 00000000..207da7ad --- /dev/null +++ b/releasenotes/notes/remove-nexenta-edge-bd90249388eae3b0.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for Nexenta Edge Driver has been removed. diff --git a/spec/defines/cinder_backend_nexenta_edge_spec.rb b/spec/defines/cinder_backend_nexenta_edge_spec.rb deleted file mode 100644 index 6c1aa6bf..00000000 --- a/spec/defines/cinder_backend_nexenta_edge_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'spec_helper' - -describe 'cinder::backend::nexenta_edge' do - let (:title) { 'nexenta_edge' } - - let :params do - { - :nexenta_rest_user => 'nexenta', - :nexenta_rest_password => 'password', - :nexenta_rest_address => '127.0.0.2', - :nexenta_client_address => '127.0.0.3' - } - end - - let :default_params do - { - :nexenta_rest_port => '8080', - :nexenta_lun_container => 'cinder', - :nexenta_iscsi_service => 'cinder', - :nexenta_chunksize => '32768', - :volume_driver => 'cinder.volume.drivers.nexenta.nexentaedge.iscsi.NexentaEdgeISCSIDriver', - :backend_availability_zone => '' - } - end - - shared_examples 'cinder::backend::nexenta_edge' do - context 'with required params' do - let :params_hash do - default_params.merge(params) - end - - it { - params_hash.each_pair do |config, value| - is_expected.to contain_cinder_config("nexenta_edge/#{config}").with_value(value) - end - } - end - - context 'nexenta edge backend with additional configuration' do - before do - params.merge!( :extra_options => {'nexenta_edge/param1' => { 'value' => 'value1' }} ) - end - - it { is_expected.to contain_cinder_config('nexenta_edge/param1').with_value('value1') } - end - - context 'nexenta edge backend with cinder type' do - before do - params.merge!( :manage_volume_type => true ) - end - - it { is_expected.to contain_cinder_type('nexenta_edge').with( - :ensure => 'present', - :properties => ['volume_backend_name=nexenta_edge'] - )} - 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::nexenta_edge' - end - end -end