openstack
/
puppet-gnocchi
Code Issues Proposed changes

Merge "Remove deprecated gnocchi::storage::swift::auth_tenant_name"

This commit is contained in:
Zuul 2021-02-23 19:47:56 +00:00 committed by Gerrit Code Review
parent 8d0f45e3b8 8a50103c10
commit 5d00c2f1d6
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/storage/swift.pp
View File

@ -67,13 +67,6 @@
# (optional) Connection timeout in seconds.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*swift_tenant_name*]
# (optional) Swift tenant name, only used if swift_auth_version is '2' or
# '3'.
# Defaults to undef
#
class gnocchi::storage::swift(
$swift_auth_version = $::os_service_default,
$swift_authurl = $::os_service_default,
@ -86,25 +79,15 @@ class gnocchi::storage::swift(
$swift_endpoint_type = $::os_service_default,
$swift_service_type = $::os_service_default,
$swift_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$swift_tenant_name = undef,
) {
include gnocchi::deps
if $swift_tenant_name != undef {
warning('gnocchi::storage::swift::swift_tenant_name is deprecated and \
will be removed in a future release. Use swift_project_name instead')
$swift_project_name_real = $swift_tenant_name
} else {
$swift_project_name_real = $swift_project_name
}
gnocchi_config {
'storage/driver': value => 'swift';
'storage/swift_user': value => $swift_user;
'storage/swift_key': value => $swift_key, secret => true;
'storage/swift_project_name': value => $swift_project_name_real;
'storage/swift_project_name': value => $swift_project_name;
'storage/swift_user_domain_name': value => $swift_user_domain_name;
'storage/swift_project_domain_name': value => $swift_project_domain_name;
'storage/swift_region': value => $swift_region;

5
releasenotes/notes/remove-swift-auth_tenant_name-32010b83e506b70c.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated ``gnocchi::storage::swift::auth_tenant_name`` parameter has
been removed.