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:
15c53ad843

Change-Id: I22cd94fbbc20cb44d97cd4bb05285c3d8e551b7a
This commit is contained in:
Emilien Macchi
2015-01-08 17:05:09 -05:00
parent b6c8e1edc9
commit 4c00a853f3
2 changed files with 5 additions and 2 deletions

View File

@@ -69,6 +69,8 @@ class cloud::monitoring::server::sensu (
$uchiwa_ip = $::ipaddress, $uchiwa_ip = $::ipaddress,
) { ) {
include cloud::params
@@rabbitmq_user { $rabbitmq_user : @@rabbitmq_user { $rabbitmq_user :
password => $rabbitmq_password, password => $rabbitmq_password,
} }
@@ -85,12 +87,11 @@ class cloud::monitoring::server::sensu (
if size($rabbitmq_user_realized) >= 1 { 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 <<| |>> Service['sensu-server'] -> Sensu::Plugin <<| |>>
include cloud::monitoring::agent::sensu include cloud::monitoring::agent::sensu
include redis
create_resources('sensu::check', $checks) create_resources('sensu::check', $checks)
create_resources('sensu::handler', $handlers) create_resources('sensu::handler', $handlers)

View File

@@ -48,6 +48,7 @@ class cloud::params {
$keepalived_name_is_process = false $keepalived_name_is_process = false
$keepalived_vrrp_script = 'systemctl status haproxy.service' $keepalived_vrrp_script = 'systemctl status haproxy.service'
$puppetmaster_package_name = 'puppet-server' $puppetmaster_package_name = 'puppet-server'
$redis_service_name = 'redis'
} # RedHat } # RedHat
'Debian': { 'Debian': {
# Specific to Debian / Ubuntu # Specific to Debian / Ubuntu
@@ -57,6 +58,7 @@ class cloud::params {
$keepalived_name_is_process = true $keepalived_name_is_process = true
$keepalived_vrrp_script = undef $keepalived_vrrp_script = undef
$puppetmaster_package_name = 'puppetmaster' $puppetmaster_package_name = 'puppetmaster'
$redis_service_name = 'redis-server'
case $::operatingsystem { case $::operatingsystem {
'Ubuntu': { 'Ubuntu': {
$libvirt_service_name = 'libvirt-bin' $libvirt_service_name = 'libvirt-bin'