diff --git a/manifests/backup/tsm.pp b/manifests/backup/tsm.pp index 629d391e..27553295 100644 --- a/manifests/backup/tsm.pp +++ b/manifests/backup/tsm.pp @@ -1,5 +1,5 @@ # == Class: cinder::backup::tsm -# +# DEPRECATED ! # Setup Cinder to backup volumes into the Tivoli Storage Manager (TSM) # # === Parameters @@ -48,13 +48,5 @@ class cinder::backup::tsm ( $backup_tsm_compression = $::os_service_default, ) { - include cinder::deps - - cinder_config { - 'DEFAULT/backup_driver': value => $backup_driver; - 'DEFAULT/backup_tsm_volume_prefix': value => $backup_tsm_volume_prefix; - 'DEFAULT/backup_tsm_password': value => $backup_tsm_password, secret => true; - 'DEFAULT/backup_tsm_compression': value => $backup_tsm_compression; - } - + warning('Support for tsm backup driver has been deprecated and has no effect') } diff --git a/releasenotes/notes/deprecate-backup-tms-9413ed39fe7c47c6.yaml b/releasenotes/notes/deprecate-backup-tms-9413ed39fe7c47c6.yaml new file mode 100644 index 00000000..a14794c0 --- /dev/null +++ b/releasenotes/notes/deprecate-backup-tms-9413ed39fe7c47c6.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The ``cinder::backup::tsm`` class has been deprecated and has no effect, + because TSM driver has been removed from cinder. This class will be removed + completely in a future release. diff --git a/spec/classes/cinder_backup_tsm_spec.rb b/spec/classes/cinder_backup_tsm_spec.rb deleted file mode 100644 index fa0214de..00000000 --- a/spec/classes/cinder_backup_tsm_spec.rb +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (C) 2016 Intel -# -# Author: Nate Potter -# -# 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. -# -# Unit tests for cinder::backup:tsm class -# -require 'spec_helper' - -describe 'cinder::backup::tsm' do - let :default_params do - { - :backup_tsm_volume_prefix => '', - :backup_tsm_password => '', - :backup_tsm_compression => '' - } - end - - let :params do - {} - end - - shared_examples 'cinder backup with tsm' do - let :p do - default_params.merge(params) - end - - it 'configures cinder.conf' do - is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.tsm.TSMBackupDriver') - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_volume_prefix').with_value(p[:backup_tsm_volume_prefix]) - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_password').with_value(p[:backup_tsm_password]).with_secret(true) - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_compression').with_value(p[:backup_tsm_compression]) - end - - context 'when overriding default parameters' do - before :each do - params.merge!(:backup_tsm_volume_prefix => 'vol-') - params.merge!(:backup_tsm_password => 'secrete') - params.merge!(:backup_tsm_compression => 'False') - end - it 'should replace default parameters with new values' do - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_volume_prefix').with_value(p[:backup_tsm_volume_prefix]) - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_password').with_value(p[:backup_tsm_password]).with_secret(true) - is_expected.to contain_cinder_config('DEFAULT/backup_tsm_compression').with_value(p[:backup_tsm_compression]) - end - 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({:os_workers => 8})) - end - - it_behaves_like 'cinder backup with tsm' - end - end -end