Remove deprecated ensure_package option
Change-Id: I4c5efcd60ef2582a47861c0ad0f96079837bb7a5
This commit is contained in:
parent
32eac5b22e
commit
8c891f34a9
@ -31,20 +31,12 @@
|
|||||||
# (optional) Control the ensure parameter for the package ressource.
|
# (optional) Control the ensure parameter for the package ressource.
|
||||||
# Defaults to 'present'.
|
# Defaults to 'present'.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*ensure_package*]
|
|
||||||
# (optional) Control the ensure parameter for the package ressource.
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
define designate::generic_service(
|
define designate::generic_service(
|
||||||
$package_name,
|
$package_name,
|
||||||
$service_name,
|
$service_name,
|
||||||
$enabled = false,
|
$enabled = false,
|
||||||
$manage_service = true,
|
$manage_service = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$ensure_package = undef
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::designate::deps
|
include ::designate::deps
|
||||||
@ -54,18 +46,10 @@ define designate::generic_service(
|
|||||||
$designate_title = "designate-${name}"
|
$designate_title = "designate-${name}"
|
||||||
Exec['post-designate_config'] ~> Anchor['designate::service::end']
|
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 ($package_name) {
|
||||||
if !defined(Package[$package_name]) {
|
if !defined(Package[$package_name]) {
|
||||||
package { $designate_title:
|
package { $designate_title:
|
||||||
ensure => $package_ensure_real,
|
ensure => $package_ensure,
|
||||||
name => $package_name,
|
name => $package_name,
|
||||||
notify => Anchor['designate::install::end'],
|
notify => Anchor['designate::install::end'],
|
||||||
tag => ['openstack', 'designate-package'],
|
tag => ['openstack', 'designate-package'],
|
||||||
|
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Deprecated ensure_package option has been removed.
|
Loading…
Reference in New Issue
Block a user