openstack/puppet-cloudkitty
Code Issues Proposed changes

Merge "deprecate cloudkitty::tenant_fetcher_backend"

Browse Source
This commit is contained in:
Zuul
2020-10-06 09:15:24 +00:00
committed by Gerrit Code Review
parent b5fcbab087 d58a0a25ed
commit d36c25cb76
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/init.pp
View File

@@ -240,7 +240,7 @@
# (Optional) Version of the storage backend to use. # (Optional) Version of the storage backend to use.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*tenant_fetcher_backend*] # [*fetcher_backend*]
# (Optional) Driver used to fetch tenant list. # (Optional) Driver used to fetch tenant list.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
@@ -252,6 +252,13 @@
# (Optional) Keystone version to use. # (Optional) Keystone version to use.
# Defaults to '3' # Defaults to '3'
# #
# DEPRECATED PARAMETERS
#
# [*tenant_fetcher_backend*]
# (Optional) Driver used to fetch tenant list.
# Defaults to $::os_service_default.
# Deprecated, use fetcher_backend instead
#
class cloudkitty( class cloudkitty(
$package_ensure = 'present', $package_ensure = 'present',
$rabbit_use_ssl = $::os_service_default, $rabbit_use_ssl = $::os_service_default,
@@ -300,11 +307,17 @@ class cloudkitty(
$pipeline = $::os_service_default, $pipeline = $::os_service_default,
$storage_backend = $::os_service_default, $storage_backend = $::os_service_default,
$storage_version = $::os_service_default, $storage_version = $::os_service_default,
$tenant_fetcher_backend = $::os_service_default, $fetcher_backend = $::os_service_default,
$auth_section = 'keystone_authtoken', $auth_section = 'keystone_authtoken',
$keystone_version = '3', $keystone_version = '3',
# DEPRECATED PARAMETERS
$tenant_fetcher_backend = undef,
) { ) {
if $tenant_fetcher_backend != undef {
warning('The parameter cloudkitty::tenant_fetcher_backend was deprecated and has no effect. Use fetcher_backend instead.')
}
include cloudkitty::params include cloudkitty::params
include cloudkitty::db include cloudkitty::db
include cloudkitty::deps include cloudkitty::deps
@@ -385,9 +398,9 @@ class cloudkitty(
} }
cloudkitty_config { cloudkitty_config {
'storage/backend': value => $storage_backend; 'storage/backend': value => $storage_backend;
'storage/version': value => $storage_version; 'storage/version': value => $storage_version;
'tenant_fetcher/backend': value => $tenant_fetcher_backend; 'fetcher/backend': value => $fetcher_backend;
} }
cloudkitty_config { cloudkitty_config {

3
releasenotes/notes/deprecate_tenant_fetcher_backend-c032fdfda0ea04c5.yaml Normal file
View File

@@ -0,0 +1,3 @@
---
deprecations:
- cloudkitty::tenant_fetcher_backend parameter is deprecated instead use cloudkitty::fetcher_backend