Consolidate Redis install to ensure_packages

Consolidate all the installs of Redis bindings
bindings to use ensure_package. Right now we
are using ensure_resources in Aodh and Gnocchi
modules which causes redeclaration issues.

Change-Id: Ib4a277dfb8fa9bc0cd74e88f91006fbc78d72c9e
(cherry picked from commit 4cf58ae78f)
This commit is contained in:
Tobias Urdin 2021-05-03 23:04:07 +02:00
parent 47b95f9b0d
commit 6eaba89705

View File

@ -59,16 +59,16 @@ The current behavior will be changed in a future release')
} }
if !is_service_default($coordination_url_real) and ($coordination_url_real =~ /^redis/ ) { if !is_service_default($coordination_url_real) and ($coordination_url_real =~ /^redis/ ) {
ensure_resource('package', 'python-redis', { ensure_packages('python-redis', {
name => $::aodh::params::redis_package_name, name => $::aodh::params::redis_package_name,
tag => 'openstack', tag => 'openstack',
}) })
} }
ensure_resource( 'package', [$::aodh::params::evaluator_package_name], ensure_packages($::aodh::params::evaluator_package_name, {
{ ensure => $package_ensure, ensure => $package_ensure,
tag => ['openstack', 'aodh-package'] } tag => ['openstack', 'aodh-package'],
) })
if $manage_service { if $manage_service {
if $enabled { if $enabled {