diff options
| author | Tomas Barton <barton.tomas@gmail.com> | 2014-02-21 14:37:55 +0100 |
|---|---|---|
| committer | Tomas Barton <barton.tomas@gmail.com> | 2014-02-21 14:37:55 +0100 |
| commit | 59f16237863e9c27c3fbf74bba4faeeff90c91c0 (patch) | |
| tree | 37e6299a9f408df414ff7cf7ddfb6bc4771fef09 | |
| parent | e2a69e56a1afcb8ad4b282e81c6a8702cf6e6005 (diff) | |
renamed ipaddress_fact to sshkey_ipaddres
| -rw-r--r-- | manifests/base.pp | 6 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 803081f..cffd798 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -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, diff --git a/manifests/init.pp b/manifests/init.pp index e3cb842..62d055d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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) |