renamed ipaddress_fact to sshkey_ipaddres

This commit is contained in:
Tomas Barton 2014-02-21 14:37:55 +01:00
parent e2a69e56a1
commit 59f1623786
2 changed files with 3 additions and 5 deletions

View file

@ -1,5 +1,5 @@
class sshd::base(
$ipaddress_fact = $sshd::ipaddress_fact,
$sshkey_ipaddress = $sshd::sshkey_ipaddress,
) {
$sshd_config_content = $::lsbdistcodename ? {
@ -29,10 +29,8 @@ class sshd::base(
}
# In case the node has uses a shared network address,
# we don't define a sshkey resource using an IP address
$ipaddr = inline_template("<%= scope.lookupvar(ipaddress_fact) %>")
if $sshd::shared_ip == 'no' {
@@sshkey{$ipaddr:
@@sshkey{$sshkey_ipaddress:
ensure => present,
tag => 'ipaddress',
type => ssh-rsa,

View file

@ -34,7 +34,7 @@ class sshd(
$print_motd = 'yes',
$manage_shorewall = false,
$shorewall_source = 'net',
$ipaddress_fact = 'ipaddress',
$sshkey_ipaddress = $::ipaddress
) {
validate_bool($manage_shorewall)