openstack/puppet-aodh
Code Issues Proposed changes

Remove deprecated ensure_package option

Browse Source 
Change-Id: I5be8fdc2705988a0fdcc5d3801b67078e7acb2c3
This commit is contained in:
ZhongShengping 2018-03-29 12:01:15 +08:00
parent 305d2d51fe
commit 7023c98764
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/init.pp
View File

@ -259,10 +259,6 @@
# (optional) The RabbitMQ virtual host. # (optional) The RabbitMQ virtual host.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*ensure_package*]
# (optional) The state of aodh packages
# Defaults to undef
#
# [*rpc_backend*] # [*rpc_backend*]
# (optional) The rpc backend implementation to use, can be: # (optional) The rpc backend implementation to use, can be:
# amqp (for AMQP 1.0 protocol) # amqp (for AMQP 1.0 protocol)
@ -329,7 +325,6 @@ class aodh (
$rabbit_port = $::os_service_default, $rabbit_port = $::os_service_default,
$rabbit_userid = $::os_service_default, $rabbit_userid = $::os_service_default,
$rabbit_virtual_host = $::os_service_default, $rabbit_virtual_host = $::os_service_default,
$ensure_package = undef,
$rpc_backend = undef, $rpc_backend = undef,
) inherits aodh::params { ) inherits aodh::params {
@ -350,16 +345,8 @@ aodh::rpc_backend are deprecated. Please use aodh::default_transport_url \
instead.") instead.")
} }
if $ensure_package {
warning("aodh::ensure_package is deprecated and will be removed in \
the future release. Please use aodh::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
package { 'aodh': package { 'aodh':
ensure => $package_ensure_real, ensure => $package_ensure,
name => $::aodh::params::common_package_name, name => $::aodh::params::common_package_name,
tag => ['openstack', 'aodh-package'], tag => ['openstack', 'aodh-package'],
} }

3
releasenotes/notes/remove_deprecated_ensure_package_option-825213ae8953e207.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated ensure_package option has been removed.