Deprecate gnocchi::database_connection
Since gnocchi::db class was introcued[1], we have 2 parameters,
gnocchi::database_connection and gnocchi::db::database_connection,
to configure the same database_connection parameter.
Let's deprecate the one in gnocchi class, so that we can have
only one parameter to set the one parameter.
[1] 4d64bd45a7
Change-Id: I6fb80bc63a9f7b370f9349681327a50d705d7514
This commit is contained in:
@@ -8,10 +8,6 @@
|
|||||||
# (optional) The state of gnocchi packages
|
# (optional) The state of gnocchi packages
|
||||||
# Defaults to 'present'
|
# Defaults to 'present'
|
||||||
#
|
#
|
||||||
# [*database_connection*]
|
|
||||||
# (optional) Connection url for the gnocchi database.
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
# [*coordination_url*]
|
# [*coordination_url*]
|
||||||
# (optional) The url to use for distributed group membership coordination.
|
# (optional) The url to use for distributed group membership coordination.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
@@ -21,16 +17,28 @@
|
|||||||
# in the gnocchi config.
|
# in the gnocchi config.
|
||||||
# Defaults to false.
|
# Defaults to false.
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
|
# [*database_connection*]
|
||||||
|
# (optional) Connection url for the gnocchi database.
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
class gnocchi (
|
class gnocchi (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$database_connection = undef,
|
|
||||||
$coordination_url = $::os_service_default,
|
$coordination_url = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
$database_connection = undef,
|
||||||
) inherits gnocchi::params {
|
) inherits gnocchi::params {
|
||||||
|
|
||||||
include gnocchi::deps
|
include gnocchi::deps
|
||||||
include gnocchi::db
|
include gnocchi::db
|
||||||
|
|
||||||
|
if $database_connection {
|
||||||
|
warning('The gnocchi::database_connection parameter is deprecated. \
|
||||||
|
Use gnocchi::db::database_connection instead.')
|
||||||
|
}
|
||||||
|
|
||||||
package { 'gnocchi':
|
package { 'gnocchi':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::gnocchi::params::common_package_name,
|
name => $::gnocchi::params::common_package_name,
|
||||||
|
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The gnocchi::database_connection was deperecated. Use the
|
||||||
|
gnocchi::db::database_connection parameter instead.
|
Reference in New Issue
Block a user