diff options
author | Matt Taggart <taggart@riseup.net> | 2015-11-20 16:42:10 -0800 |
---|---|---|
committer | Matt Taggart <taggart@riseup.net> | 2015-11-20 16:42:10 -0800 |
commit | 14f0d6dbd09f36f523fc1aa1b0c68a9af4ebb227 (patch) | |
tree | 32a8a8a5becd704fc748565dcfcff71ccd5ed1c0 | |
parent | 1aeeca2c1662c464d684dda1bf7c0128242f695b (diff) |
allow setting the desired agent hostname, but default to fqdn
-rw-r--r-- | manifests/agent.pp | 2 | ||||
-rw-r--r-- | manifests/agent/register.pp | 9 |
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, } - - } |