From 83963cef28ca42055d5becbf0b697ee1f4bd5d4a Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 22 Dec 2009 11:00:09 -0500
Subject: adjust mysql commands & service

---
 manifests/service/mysql.pp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'manifests/service/mysql.pp')

diff --git a/manifests/service/mysql.pp b/manifests/service/mysql.pp
index d09f335..9d99d09 100644
--- a/manifests/service/mysql.pp
+++ b/manifests/service/mysql.pp
@@ -4,30 +4,24 @@ define nagios::service::mysql(
     $check_socket = 'absent',
     $check_username = 'nagios',
     $check_password = '',
-    $check_database = '',
-    $check_mode = 'absent'
+    $check_mode = 'tcp'
 ){
 
-    $real_check_mode = $check_mode ? {
-        'absent' => 'tcp',
-        default => 'socket',
-    }
-
-    case $real_check_mode {
+    case $check_mode {
         # Check MySQL using TCP
         'tcp': {
             nagios::service { 'mysql_tcp':
                 ensure => $ensure,
-                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}!${check_database}",
+                check_command => "check_mysql_tcp!${check_hostname}!${check_username}!${check_password}",
             }
         }
         # Check MySQL using local socket
-        'socket': {
+        default: {
             nagios::service { 'mysql_socket':
                 ensure => $ensure,
                 check_command => $check_socket ? {
                     'absent' => "check_mysql!${check_username}!${check_password}!${check_database}",
-                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}!${check_database}",
+                    default => "check_mysql_socket!${check_socket}!${check_username}!${check_password}",
                 },
             }
         }
-- 
cgit v1.2.3