renamed ipaddress_fact to sshkey_ipaddres

diff --git a/manifests/base.pp b/manifests/base.pp
index 803081f5244b80e975a1ee225e1a38810530fd34..cffd798e3a8fb7b6f611d45506145a7e41dd6a55 100644 (file)
--- 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 e3cb8427a54a9fad3c98deb27bcdb8652961547b..62d055d916506db1ff645081a3188e8f09fdf716 100644 (file)
--- 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)