From 6eaba89705c52db199bcbdfa0acf9968aa405876 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Mon, 3 May 2021 23:04:07 +0200
Subject: [PATCH] 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 4cf58ae78f315549abefdb2fd8d564e817183a7b)
---
 manifests/evaluator.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/evaluator.pp b/manifests/evaluator.pp
index cb46b841..8b21ed94 100644
--- a/manifests/evaluator.pp
+++ b/manifests/evaluator.pp
@@ -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/ ) {
-    ensure_resource('package', 'python-redis', {
+    ensure_packages('python-redis', {
       name   => $::aodh::params::redis_package_name,
       tag    => 'openstack',
     })
   }
 
-  ensure_resource( 'package', [$::aodh::params::evaluator_package_name],
-    { ensure => $package_ensure,
-      tag    => ['openstack', 'aodh-package'] }
-  )
+  ensure_packages($::aodh::params::evaluator_package_name, {
+    ensure => $package_ensure,
+    tag    => ['openstack', 'aodh-package'],
+  })
 
   if $manage_service {
     if $enabled {