Inconsistent package_ensure parameter name

The parameter name used to enforce package state is inconsistent across
manifests and modules. I settle on package_ensure since it's already
widely used.

Change-Id: I843bdc0b9f72b4758c19e6a8ddad1368c7d80977
Closes-Bug: #1668732
This commit is contained in:
ZhongShengping 2017-03-08 18:07:44 +08:00
parent 27893d520c
commit 516c0e1ea4
3 changed files with 24 additions and 4 deletions

View File

@ -33,7 +33,7 @@
# include amqp and zmq.
# Defaults to 'rabbit'.
#
# [*ensure_package*]
# [*package_ensure*]
# (optional) Whether the watcher api package will be installed
# Defaults to 'present'
#
@ -300,6 +300,12 @@
# in the watcher config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) Whether the watcher api package will be installed
# Defaults to undef
#
# === Authors
#
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
@ -313,7 +319,7 @@ class watcher (
$neutron_client_api_version = '2',
$nova_client_api_version = '2',
$rpc_backend = 'rabbit',
$ensure_package = 'present',
$package_ensure = 'present',
$rabbit_login_method = $::os_service_default,
$rabbit_retry_interval = $::os_service_default,
$rabbit_retry_backoff = $::os_service_default,
@ -372,6 +378,8 @@ class watcher (
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
# DEPRECATED PARAMETERS
$ensure_package = undef,
) {
include ::openstacklib::openstackclient
@ -382,8 +390,16 @@ class watcher (
include ::watcher::db
include ::watcher::logging
if $ensure_package {
warning("watcher::ensure_package is deprecated and will be removed in \
the future release. Please use watcher::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
package { 'watcher':
ensure => $ensure_package,
ensure => $package_ensure_real,
name => $::watcher::params::common_package_name,
tag => ['openstack', 'watcher-package'],
}

View File

@ -0,0 +1,4 @@
---
deprecations:
- watcher::ensure_package is now deprecated and will be removed in the
future release. Please use watcher::package_ensure instead.

View File

@ -65,7 +65,7 @@ describe 'watcher' do
:kombu_compression => 'gzip',
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:notification_topics => 'notifications',
:ensure_package => '2012.1.1-15.el6',
:package_ensure => '2012.1.1-15.el6',
}
end
it 'configures rabbit' do