Remove deprecated ensure_package option

Change-Id: I4c5efcd60ef2582a47861c0ad0f96079837bb7a5
This commit is contained in:
ZhongShengping 2018-03-29 12:01:15 +08:00
parent 32eac5b22e
commit 8c891f34a9
2 changed files with 4 additions and 17 deletions

View File

@ -31,20 +31,12 @@
# (optional) Control the ensure parameter for the package ressource.
# Defaults to 'present'.
#
# DEPRECATED PARAMETERS
#
# [*ensure_package*]
# (optional) Control the ensure parameter for the package ressource.
# Defaults to undef.
#
define designate::generic_service(
$package_name,
$service_name,
$enabled = false,
$manage_service = true,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
$ensure_package = undef
) {
include ::designate::deps
@ -54,18 +46,10 @@ define designate::generic_service(
$designate_title = "designate-${name}"
Exec['post-designate_config'] ~> Anchor['designate::service::end']
if $ensure_package {
warning("designate::generic_service::ensure_package is deprecated and will be removed in \
the future release. Please use designate::generic_service::package_ensure instead.")
$package_ensure_real = $ensure_package
} else {
$package_ensure_real = $package_ensure
}
if ($package_name) {
if !defined(Package[$package_name]) {
package { $designate_title:
ensure => $package_ensure_real,
ensure => $package_ensure,
name => $package_name,
notify => Anchor['designate::install::end'],
tag => ['openstack', 'designate-package'],

View File

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