diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 2780f26e..780133dc 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -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'], diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-b1a7d2a9e67af4c0.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-b1a7d2a9e67af4c0.yaml new file mode 100644 index 00000000..67253070 --- /dev/null +++ b/releasenotes/notes/remove_deprecated_ensure_package_option-b1a7d2a9e67af4c0.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - Deprecated ensure_package option has been removed.