From 4c00a853f359acfd881394ccf4b5816fb30f26cb Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Thu, 8 Jan 2015 17:05:09 -0500
Subject: [PATCH] Sensu: update usage of puppet-redis

In OPM, we changed puppet-redis source to have another module that
support Sentinel for Redis Scalability.

We need to update our usage of puppet-redis so Sensu can still work.

Commit in OPM:
https://github.com/redhat-openstack/openstack-puppet-modules/commit/15c53ad843d0811f7413ae55a987ef0435c1b79c

Change-Id: I22cd94fbbc20cb44d97cd4bb05285c3d8e551b7a
---
 manifests/monitoring/server/sensu.pp | 5 +++--
 manifests/params.pp                  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/monitoring/server/sensu.pp b/manifests/monitoring/server/sensu.pp
index 1b2af830..21f2ec97 100644
--- a/manifests/monitoring/server/sensu.pp
+++ b/manifests/monitoring/server/sensu.pp
@@ -69,6 +69,8 @@ class cloud::monitoring::server::sensu (
   $uchiwa_ip                 = $::ipaddress,
 ) {
 
+  include cloud::params
+
   @@rabbitmq_user { $rabbitmq_user :
     password => $rabbitmq_password,
   }
@@ -85,12 +87,11 @@ class cloud::monitoring::server::sensu (
 
   if size($rabbitmq_user_realized) >= 1 {
 
-    Service['redis-6379'] -> Service['sensu-api'] -> Service['sensu-server'] -> Service['uchiwa']
+    Service["${::cloud::params::redis_service_name}"] -> Service['sensu-api'] -> Service['sensu-server'] -> Service['uchiwa']
     Service['sensu-server'] -> Sensu::Plugin <<| |>>
 
 
     include cloud::monitoring::agent::sensu
-    include redis
 
     create_resources('sensu::check', $checks)
     create_resources('sensu::handler', $handlers)
diff --git a/manifests/params.pp b/manifests/params.pp
index a482b074..6c0bf4e4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -48,6 +48,7 @@ class cloud::params {
       $keepalived_name_is_process = false
       $keepalived_vrrp_script     = 'systemctl status haproxy.service'
       $puppetmaster_package_name  = 'puppet-server'
+      $redis_service_name         = 'redis'
     } # RedHat
     'Debian': {
       # Specific to Debian / Ubuntu
@@ -57,6 +58,7 @@ class cloud::params {
       $keepalived_name_is_process = true
       $keepalived_vrrp_script     = undef
       $puppetmaster_package_name  = 'puppetmaster'
+      $redis_service_name         = 'redis-server'
       case $::operatingsystem {
         'Ubuntu': {
           $libvirt_service_name = 'libvirt-bin'