Use merge() for host_aliases in ssh::known_hosts

2013-01-23 17:12:21 +02:00 · 2013-01-23 17:12:21 +02:00 · 3d26fe7814
commit 3d26fe7814
parent 299f5a11fa
1 changed files with 4 additions and 7 deletions
--- a/ssh/manifests/init.pp
+++ b/ssh/manifests/init.pp
@ -12,13 +12,10 @@ class ssh::known_hosts {
        },
    }

-    $shortname = inline_template("<%= homename.split('.')[0] %>")
-
-    if $::ec2_public_ipv4 {
-        $aliases = [ $shortname, $::ipaddress, $::ec2_public_ipv4 ]
-    } else {
-        $aliases = [ $shortname, $::ipaddress ]
-    }
+    $aliases = merge(inline_template("<%= homename.split('.')[0] %>"),
+                     $::ipaddress,
+                     $::ipaddress6,
+                     $::ec2_public_ipv4)

    @@sshkey { $homename:
        ensure       => present,