diff options
| author | Micah <micah@riseup.net> | 2015-12-04 02:48:34 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-12-04 02:48:34 +0000 |
| commit | dc9d8cca10d64ab7027f6c876a3bc89e19cf4639 (patch) | |
| tree | 3c6c08de86bd7ffd75a5ac53ffd644f4ebc158a4 | |
| parent | 5f004960cec76487b4c3c4e3618f981aca18a521 (diff) | |
| parent | 6a88fe50293154da8c8c49ed402326eda6c6ad2e (diff) | |
Merge branch 'sethostname3' into 'master'
also have the hostname override the name that the key gets on the agent
The previous merge request that added support for overriding the hostname used for ssh, but it neglected to override the host key name so when you did override the hostname then ssh would use the wrong key and fail.
See merge request !10
| -rw-r--r-- | manifests/agent.pp | 1 | ||||
| -rw-r--r-- | manifests/agent/config.pp | 8 | ||||
| -rw-r--r-- | manifests/agent/generate_sshkey.pp | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp index d3d48b2..64109ae 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -57,6 +57,7 @@ class check_mk::agent ( method => $method, generate_sshkey => $generate_sshkey, sshuser => $sshuser, + hostname => $hostname, require => Class['check_mk::agent::install'], } diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp index 5907d43..8ee5f18 100644 --- a/manifests/agent/config.pp +++ b/manifests/agent/config.pp @@ -9,7 +9,8 @@ class check_mk::agent::config ( $user, $method = 'xinetd', $generate_sshkey = false, - $sshuser = undef + $sshuser = undef, + $hostname = $::fqdn ) { if $use_cache { $server = "${server_dir}/check_mk_caching_agent" @@ -38,11 +39,12 @@ class check_mk::agent::config ( 'ssh': { if $generate_sshkey { - check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}": + check_mk::agent::generate_sshkey { "check_mk_key_${hostname}": keydir => $keydir, authdir => $authdir, authfile => $authfile, - sshuser => $sshuser + sshuser => $sshuser, + hostname => $hostname } } diff --git a/manifests/agent/generate_sshkey.pp b/manifests/agent/generate_sshkey.pp index 807e826..b00271f 100644 --- a/manifests/agent/generate_sshkey.pp +++ b/manifests/agent/generate_sshkey.pp @@ -15,11 +15,12 @@ define check_mk::agent::generate_sshkey ( $ssh_key_basepath = '/etc/puppet/modules/check_mk/keys', # user on the client the check_mk server will ssh to, to run the agent $sshuser = 'root', + $hostname = $::fqdn, $check_mk_tag = 'check_mk_sshkey' ){ # generate check-mk ssh keypair, stored on puppetmaster - $ssh_key_name = "${::fqdn}_id_rsa" + $ssh_key_name = "${hostname}_id_rsa" $ssh_keys = ssh_keygen("${ssh_key_basepath}/${ssh_key_name}") $public = split($ssh_keys[1],' ') $public_type = $public[0] |