From 1afa7f5ae112a9af34f5602cbaae567d03f40863 Mon Sep 17 00:00:00 2001 From: Ivan Pchelintsev Date: Tue, 13 Apr 2021 11:46:41 +0300 Subject: [PATCH] Remove deprecated dellemc_xtremio_iscsi resource tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi is deprecated and should have been removed in Victoria release. Note: This change includes switch of puppetlabs-haproxy branch name to fix the unit tests failure at the same time. Change-Id: I0682ab192de4ddafc4abcc9d57b1dacc713c49a8 --- Puppetfile_extras | 2 +- manifests/profile/base/cinder/volume.pp | 14 ----- .../cinder/volume/dellemc_xtremio_iscsi.pp | 53 ----------------- ...si-remove-deprecated-da9224d14cef4fde.yaml | 6 ++ ..._profile_base_cinder_xtremio_iscsi_spec.rb | 57 ------------------- 5 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp create mode 100644 releasenotes/notes/xtremio-iscsi-remove-deprecated-da9224d14cef4fde.yaml delete mode 100644 spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb diff --git a/Puppetfile_extras b/Puppetfile_extras index 2db1bb2c8..e7fa4cba1 100644 --- a/Puppetfile_extras +++ b/Puppetfile_extras @@ -3,7 +3,7 @@ mod 'haproxy', :git => 'https://github.com/puppetlabs/puppetlabs-haproxy', - :ref => 'master' + :ref => 'main' mod 'tomcat', :git => 'https://github.com/puppetlabs/puppetlabs-tomcat', diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index 68c8ffb51..3658b3b60 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -62,10 +62,6 @@ # (Optional) Whether to enable the xtremio backend # Defaults to false # -# [*cinder_enable_dellemc_xtremio_iscsi_backend*] -# (Optional) Whether to enable the xtremio iscsi backend -# Defaults to false -# # [*cinder_enable_hpelefthand_backend*] # (Optional) Whether to enable the hpelefthand backend # Defaults to false @@ -151,7 +147,6 @@ class tripleo::profile::base::cinder::volume ( $cinder_enable_dellemc_vnx_backend = false, $cinder_enable_dellemc_vxflexos_backend = false, $cinder_enable_dellemc_xtremio_backend = false, - $cinder_enable_dellemc_xtremio_iscsi_backend = false, $cinder_enable_hpelefthand_backend = false, $cinder_enable_iscsi_backend = true, $cinder_enable_netapp_backend = false, @@ -288,14 +283,6 @@ class tripleo::profile::base::cinder::volume ( $cinder_dellemc_xtremio_backend_name = undef } - if $cinder_enable_dellemc_xtremio_iscsi_backend { - include tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi - $cinder_dellemc_xtremio_iscsi_backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', - 'tripleo_dellemc_xtremio_iscsi') - } else { - $cinder_dellemc_xtremio_iscsi_backend_name = undef - } - if $cinder_enable_hpelefthand_backend { include tripleo::profile::base::cinder::volume::hpelefthand $cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand') @@ -386,7 +373,6 @@ class tripleo::profile::base::cinder::volume ( $cinder_dellemc_vnx_backend_name, $cinder_dellemc_vxflexos_backend_name, $cinder_dellemc_xtremio_backend_name, - $cinder_dellemc_xtremio_iscsi_backend_name, $cinder_hpelefthand_backend_name, $cinder_netapp_backend_name, $cinder_nfs_backend_name, diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp deleted file mode 100644 index e00da9ec0..000000000 --- a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (c) 2016-2018 Dell Inc, or its subsidiaries. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi -# -# Cinder Volume dellemc_xtremio_iscsi profile for tripleo -# -# === Parameters -# -# [*backend_name*] -# (Optional) Name given to the Cinder backend stanza -# Defaults to 'tripleo_dellemc_xtremio_iscsi' -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi ( - $backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', 'tripleo_dellemc_xtremio_iscsi'), - $step = Integer(hiera('step')), -) { - include tripleo::profile::base::cinder::volume - - - warning('The dellemc_xtremio_iscsi class will be removed in V-Release, please use the dellemc_xtremio resource instead.') - - if $step >= 4 { - cinder::backend::dellemc_xtremio_iscsi { $backend_name : - backend_availability_zone => hiera('cinder::backend::dellemc_xtremio_iscsi::backend_availability_zone', undef), - san_ip => hiera('cinder::backend::dellemc_xtremio_iscsi::san_ip', undef), - san_login => hiera('cinder::backend::dellemc_xtremio_iscsi::san_login', undef), - san_password => hiera('cinder::backend::dellemc_xtremio_iscsi::san_password', undef), - xtremio_cluster_name => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_cluster_name', undef), - xtremio_array_busy_retry_count => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count', undef), - xtremio_array_busy_retry_interval => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval', undef), - xtremio_volumes_per_glance_cache => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache', undef), - xtremio_ports => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_ports', undef), - } - } - -} diff --git a/releasenotes/notes/xtremio-iscsi-remove-deprecated-da9224d14cef4fde.yaml b/releasenotes/notes/xtremio-iscsi-remove-deprecated-da9224d14cef4fde.yaml new file mode 100644 index 000000000..8aaf70225 --- /dev/null +++ b/releasenotes/notes/xtremio-iscsi-remove-deprecated-da9224d14cef4fde.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Remove deprecated + tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi. Use + tripleo::profile::base::cinder::volume::dellemc_xtremio instead. \ No newline at end of file diff --git a/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb b/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb deleted file mode 100644 index be97ad55b..000000000 --- a/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2016-2018 Dell Inc, or its subsidiaries -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -require 'spec_helper' - -describe 'tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi' do - shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi' do - before :each do - facts.merge!({ :step => params[:step] }) - end - - context 'with step less than 4' do - let(:params) { { :step => 3 } } - - it 'should do nothing' do - is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi') - is_expected.to contain_class('tripleo::profile::base::cinder::volume') - is_expected.to contain_class('tripleo::profile::base::cinder') - is_expected.to_not contain_cinder__backend__dellemc_xtremio_iscsi('tripleo_dellemc_xtremio_iscsi') - end - end - - context 'with step 4' do - let(:params) { { - :step => 4, - } } - - it 'should trigger complete configuration' do - # TODO(aschultz): check hiera parameters - is_expected.to contain_cinder__backend__dellemc_xtremio_iscsi('tripleo_dellemc_xtremio_iscsi') - end - end - end - - - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) do - facts.merge({ :hostname => 'node.example.com' }) - end - - it_behaves_like 'tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi' - end - end -end