Merge "Remove deprecated parameters"

This commit is contained in:
Zuul 2018-06-13 14:19:47 +00:00 committed by Gerrit Code Review
commit e5aa68a0f3
4 changed files with 8 additions and 53 deletions

View File

@ -20,8 +20,6 @@ class { '::gnocchi::api':
class { '::gnocchi::statsd':
resource_id => '07f26121-5777-48ba-8a0b-d70468133dd9',
user_id => 'f81e9b1f-9505-4298-bc33-43dfbd9a973b',
project_id => '203ef419-e73f-4b8a-a73f-3d599a72b18d',
archive_policy_name => 'high',
flush_delay => '100',
}

View File

@ -46,20 +46,6 @@
# (optional) Middlewares to use.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*host*]
# (optional) The gnocchi api bind address.
# Defaults to $::os_service_default
#
# [*port*]
# (optional) The gnocchi api port.
# Defaults to $::os_service_default
#
# [*workers*]
# (optional) Number of workers for Gnocchi API server.
# Defaults to $::os_service_default
#
class gnocchi::api (
$manage_service = true,
$enabled = true,
@ -70,27 +56,11 @@ class gnocchi::api (
$auth_strategy = 'keystone',
$enable_proxy_headers_parsing = $::os_service_default,
$middlewares = $::os_service_default,
# DEPRECATED
$host = $::os_service_default,
$port = $::os_service_default,
$workers = $::os_service_default,
) inherits gnocchi::params {
include ::gnocchi::deps
include ::gnocchi::policy
if !is_service_default($host) {
warning('host is deprecated')
}
if !is_service_default($port) {
warning('port is deprecated')
}
if !is_service_default($workers) {
warning('workers is deprecated')
}
package { 'gnocchi-api':
ensure => $package_ensure,
name => $::gnocchi::params::api_package_name,

View File

@ -24,16 +24,6 @@
# (optional) Archive policy name to use when creating metrics.
# Defaults to undef.
#
# DEPRECATED PARAMETERS
#
# [*user_id*]
# (required) User UUID to use to identify statsd in Gnocchi.
# Defaults to undef.
#
# [*project_id*]
# (required) Project UUID to use to identify statsd in Gnocchi.
# Defaults to undef.
#
class gnocchi::statsd (
$resource_id,
$flush_delay,
@ -41,21 +31,10 @@ class gnocchi::statsd (
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$user_id = undef,
$project_id = undef,
) inherits gnocchi::params {
include ::gnocchi::deps
if $user_id {
warning('user_id parameter is deprecated and will be removed in the future release.')
}
if $project_id {
warning('project_id parameter is deprecated and will be removed in the future release.')
}
package { 'gnocchi-statsd':
ensure => $package_ensure,
name => $::gnocchi::params::statsd_package_name,

View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The deprecated parameters glance::api::host, glance::api::port
and glance::api::workers has been removed.
- |
The deprecated parameters glance::statsd::user_id and
gnocchi::statsd::project_id has been removed.