From 84e745a6d6ce6529e451305cbf7a67618390d875 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 17 Jan 2014 14:49:51 -0800
Subject: pass the homedir parameter down from check_mk::agent so we can
 override it

---
 manifests/agent.pp                 | 2 ++
 manifests/agent/config.pp          | 5 ++++-
 manifests/agent/generate_sshkey.pp | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/agent.pp b/manifests/agent.pp
index c6e59ad..24f69bd 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -4,6 +4,7 @@ class check_mk::agent (
   $ip_whitelist = undef,
   $port         = '6556',
   $server_dir   = '/usr/bin',
+  $homedir      = '/omd/sites/monitoring',
   $use_cache    = false,
   $user         = 'root',
   $version      = undef,
@@ -37,6 +38,7 @@ class check_mk::agent (
     ip_whitelist => $ip_whitelist,
     port         => $port,
     server_dir   => $server_dir,
+    homedir      => $homedir,
     use_cache    => $use_cache,
     user         => $user,
     use_ssh      => $use_ssh,
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
index 82636f5..5b9323a 100644
--- a/manifests/agent/config.pp
+++ b/manifests/agent/config.pp
@@ -2,6 +2,7 @@ class check_mk::agent::config (
   $ip_whitelist = '',
   $port,
   $server_dir,
+  $homedir,
   $use_cache,
   $user,
   $use_ssh = false
@@ -14,7 +15,9 @@ class check_mk::agent::config (
   }
 
   if ( $use_ssh == true ){
-    check_mk::agent::generate_sshkey { 'check_mk_key': }
+    check_mk::agent::generate_sshkey { 'check_mk_key':
+      homedir => $homedir
+    }
   } else {
 
     if $ip_whitelist {
diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp
index 58ce6fe..3187037 100644
--- a/manifests/agent/generate_sshkey.pp
+++ b/manifests/agent/generate_sshkey.pp
@@ -2,7 +2,7 @@ define check_mk::agent::generate_sshkey(
   $ssh_key_basepath = '/etc/puppet/modules/keys/files/check_mk_keys',
   $user             = 'monitoring',
   $group            = 'monitoring',
-  $homedir          = '/omd/sites/monitoring',
+  $homedir,
   $check_mk_tag     = 'check_mk_sshkey'
 ){
 
-- 
cgit v1.2.3