diff --git a/manifests/init.pp b/manifests/init.pp index aa2077c2..cf5b3e91 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ # # === Parameters # -# [*ensure_package*] +# [*package_ensure*] # (optional) The state of aodh packages # Defaults to 'present' # @@ -260,8 +260,12 @@ # (optional) The RabbitMQ virtual host. # Defaults to $::os_service_default # +# [*ensure_package*] +# (optional) The state of aodh packages +# Defaults to undef +# class aodh ( - $ensure_package = 'present', + $package_ensure = 'present', $alarm_history_time_to_live = $::os_service_default, $default_transport_url = $::os_service_default, $rpc_response_timeout = $::os_service_default, @@ -319,6 +323,7 @@ class aodh ( $rabbit_port = $::os_service_default, $rabbit_userid = $::os_service_default, $rabbit_virtual_host = $::os_service_default, + $ensure_package = undef, ) inherits aodh::params { include ::aodh::deps @@ -336,8 +341,16 @@ aodh::rabbit_port, aodh::rabbit_userid and aodh::rabbit_virtual_host are \ deprecated. Please use aodh::default_transport_url instead.") } + if $ensure_package { + warning("aodh::ensure_package is deprecated and will be removed in \ +the future release. Please use aodh::package_ensure instead.") + $package_ensure_real = $ensure_package + } else { + $package_ensure_real = $package_ensure + } + package { 'aodh': - ensure => $ensure_package, + ensure => $package_ensure_real, name => $::aodh::params::common_package_name, tag => ['openstack', 'aodh-package'], } diff --git a/releasenotes/notes/deprecate_ensure_package_parameter-a239528713d6791f.yaml b/releasenotes/notes/deprecate_ensure_package_parameter-a239528713d6791f.yaml new file mode 100644 index 00000000..1df3d3b7 --- /dev/null +++ b/releasenotes/notes/deprecate_ensure_package_parameter-a239528713d6791f.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - aodh::ensure_package is now deprecated and will be removed in the + future release. Please use aodh::package_ensure instead. diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index 1dd5c195..c68cca76 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -64,7 +64,7 @@ describe 'aodh' 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', :gnocchi_url => 'http://127.0.0.1:8041', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_driver => 'ceilometer.compute.aodh_notifier',