diff --git a/manifests/init.pp b/manifests/init.pp index d4525d2..406ef38 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,20 +25,12 @@ # (Optional) Run db sync on the node. # Defaults to true. # -# DEPRECATED PARAMETERS -# -# [*ensure_package*] -# (optional) The state of rally packages -# Defaults to undef. -# class rally ( $package_ensure = 'present', $rally_debug = $::os_service_default, $openstack_client_http_timeout = $::os_service_default, $purge_config = false, $sync_db = true, - # DEPRECATED PARAMETERS - $ensure_package = undef, ) inherits ::rally::params { include ::rally::deps @@ -49,16 +41,8 @@ class rally ( # Keep backward compatibility $openstack_client_http_timeout_real = pick($::rally::settings::openstack_client_http_timeout,$openstack_client_http_timeout) - if $ensure_package { - warning("rally::ensure_package is deprecated and will be removed in \ -the future release. Please use rally::package_ensure instead.") - $package_ensure_real = $ensure_package - } else { - $package_ensure_real = $package_ensure - } - package { 'rally': - ensure => $package_ensure_real, + ensure => $package_ensure, name => $::rally::params::package_name, tag => ['openstack', 'rally-package'], } diff --git a/releasenotes/notes/remove_deprecated_ensure_package_option-a07df1c72c1926a6.yaml b/releasenotes/notes/remove_deprecated_ensure_package_option-a07df1c72c1926a6.yaml new file mode 100644 index 0000000..6725307 --- /dev/null +++ b/releasenotes/notes/remove_deprecated_ensure_package_option-a07df1c72c1926a6.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - Deprecated ensure_package option has been removed.