summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Taggart <taggart@riseup.net>2015-11-21 21:01:24 +0000
committerMatt Taggart <taggart@riseup.net>2015-11-21 21:01:24 +0000
commit5f004960cec76487b4c3c4e3618f981aca18a521 (patch)
tree69244a00a3717f4f43252e9a9c4f18bd0e33d896
parentefb95465c7830ddf76c9ebe974080e9196e032ad (diff)
parent14f0d6dbd09f36f523fc1aa1b0c68a9af4ebb227 (diff)
Merge branch 'sethostname2' into 'master'
allow setting the desired agent hostname, but default to fqdn Sometimes the host's fqdn isn't the hostname you want it to use for ssh, allow overriding it See merge request !9
-rw-r--r--manifests/agent.pp2
-rw-r--r--manifests/agent/register.pp9
2 files changed, 7 insertions, 4 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp
index c455bd5..d3d48b2 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -17,6 +17,7 @@ class check_mk::agent (
$generate_sshkey = false,
$sshuser = undef,
$use_ssh_tag = 'ssh',
+ $hostname = $::fqdn,
$register_agent = true
) {
@@ -62,6 +63,7 @@ class check_mk::agent (
if ( $register_agent ) {
class { 'check_mk::agent::register':
host_tags => $tags,
+ hostname => $hostname,
}
}
}
diff --git a/manifests/agent/register.pp b/manifests/agent/register.pp
index 9d12fc7..46cdeae 100644
--- a/manifests/agent/register.pp
+++ b/manifests/agent/register.pp
@@ -1,7 +1,8 @@
-class check_mk::agent::register ($host_tags = '') {
- @@check_mk::host { $::fqdn:
+class check_mk::agent::register (
+ $host_tags = '',
+ $hostname = $::fqdn
+) {
+ @@check_mk::host { $hostname:
host_tags => $host_tags,
}
-
-
}