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: I3f0d04677723884a28a65f469305f89311b08da2
Closes-Bug: #1668732
This commit is contained in:
ZhongShengping 2017-03-08 17:43:48 +08:00
parent 0d8fc34a7d
commit 04a76970fd
3 changed files with 24 additions and 4 deletions

View File

@ -4,7 +4,7 @@
#
# === Parameters
#
# [*ensure_package*]
# [*package_ensure*]
# (optional) The state of aodh packages
# Defaults to 'present'
#
@ -175,8 +175,14 @@
# in the octavia config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) The state of aodh packages
# Defaults to undef
#
class octavia (
$ensure_package = 'present',
$package_ensure = 'present',
$default_transport_url = $::os_service_default,
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::os_service_default,
@ -213,13 +219,23 @@ class octavia (
$notification_topics = $::os_service_default,
$topic = 'octavia-rpc',
$purge_config = false,
# DEPRECATED PARAMETERS
$ensure_package = undef,
) inherits octavia::params {
include ::octavia::deps
include ::octavia::logging
if $ensure_package {
warning("octavia::ensure_package is deprecated and will be removed in \
the future release. Please use octavia::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
package { 'octavia':
ensure => $ensure_package,
ensure => $package_ensure_real,
name => $::octavia::params::common_package_name,
tag => ['openstack', 'octavia-package'],
}

View File

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

View File

@ -58,7 +58,7 @@ describe 'octavia' do
:rabbit_heartbeat_timeout_threshold => '60',
:rabbit_heartbeat_rate => '10',
:kombu_compression => 'gzip',
:ensure_package => '2012.1.1-15.el6',
:package_ensure => '2012.1.1-15.el6',
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:notification_driver => 'ceilometer.compute.octavia_notifier',
:notification_topics => 'openstack',