openstack/puppet-cinder
Code Issues Proposed changes

Deprecate backup_topic option

Browse Source 
The backup_topic parameter is deprecated, has no effect
and will be removed in future release.

Change-Id: I6904b1d05a0b185c493d415436ac77c84fbc9271
This commit is contained in:
ZhongShengping 2016-09-26 14:32:36 +08:00
parent a36d4f91a1
commit c7d3eddf1c
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/backup.pp
View File

@ -16,10 +16,6 @@
# (Optional) Ensure state for package.
# Defaults to 'present'.
#
# [*backup_topic*]
# (optional) The topic volume backup nodes listen on.
# Defaults to $::os_service_default
#
# [*backup_manager*]
# (optional) Full class name for the Manager for volume backup.
# Defaults to $::os_service_default
@ -32,6 +28,12 @@
# (optional) Template string to be used to generate backup names.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*backup_topic*]
# (optional) The topic volume backup nodes listen on.
# Defaults to undef
#
# === Author(s)
#
# Emilien Macchi <emilien.macchi@enovance.com>
@ -52,15 +54,15 @@
# License for the specific language governing permissions and limitations
# under the License.
#
#
class cinder::backup (
$enabled = true,
$manage_service = true,
$package_ensure = 'present',
$backup_topic = $::os_service_default,
$backup_manager = $::os_service_default,
$backup_api_class = $::os_service_default,
$backup_name_template = $::os_service_default,
#DEPRECATED PARAMETERS
$backup_topic = undef,
) {
include ::cinder::deps
@ -93,8 +95,11 @@ class cinder::backup (
tag => 'cinder-service',
}
if $backup_topic {
warning('The backup_topic parameter is deprecated, has no effect and will be removed in future release.')
}
cinder_config {
'DEFAULT/backup_topic': value => $backup_topic;
'DEFAULT/backup_manager': value => $backup_manager;
'DEFAULT/backup_api_class': value => $backup_api_class;
'DEFAULT/backup_name_template': value => $backup_name_template;

3
releasenotes/notes/deprecate_backup_topic_option-1832f8a9d21285ae.yaml Normal file
View File

@ -0,0 +1,3 @@
---
deprecations:
- The backup_topic parameter is deprecated.

2
spec/classes/cinder_backup_spec.rb
View File

@ -25,7 +25,6 @@ describe 'cinder::backup' do
let :default_params do
{ :enable => true,
:manage_service => true,
:backup_topic => '<SERVICE DEFAULT>',
:backup_manager => '<SERVICE DEFAULT>',
:backup_api_class => '<SERVICE DEFAULT>',
:backup_name_template => '<SERVICE DEFAULT>' }
@ -60,7 +59,6 @@ describe 'cinder::backup' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_topic').with_value(p[:backup_topic])
is_expected.to contain_cinder_config('DEFAULT/backup_manager').with_value(p[:backup_manager])
is_expected.to contain_cinder_config('DEFAULT/backup_api_class').with_value(p[:backup_api_class])
is_expected.to contain_cinder_config('DEFAULT/backup_name_template').with_value(p[:backup_name_template])