Issue 122 - Puppet ENC via Hiera

modules/base/manifests/init.pp

-class base {
+class base ($zone='adblockplus.org') {
   stage {'pre': before => Stage['main']}
   stage {'post': require => Stage['main']}
 
   class {'users':
     stage => 'pre',
   }
 
   class {'apt':
     always_apt_update => true
   }
@@ skipping 21 matching lines @@
 
   service {'cron':
     ensure => running,
     enable => true,
   }
 
   class {'logrotate':
     stage => 'post'
   }
 
-  $servers = hiera("servers")
+  $servers = hiera('servers')
   create_resources(base::explicit_host_record, $servers)
 
-  define explicit_host_record($ip, $ssh_public_key=undef){
-    host{"$name,$ip":

[Wladimir Palant, 2014/09/09 18:15:06]

Will this work correctly for hosts that have multiple IP addresses?

[mathias, 2014/10/08 03:02:33]

It will, although the host{$key:} looks awkward then: Puppet does not insert
spaces or commas between the array items. The $ip parameter works fine anyway.
However, we'll improve that one.

+  define explicit_host_record(
+    $ip,
+    $ssh_public_key = undef,
+    $role           = undef,
+    $dns            = undef,
+    $groups         = undef,
+  ) {
+    
+    if is_array($ip) {
+      $internal_ip = $ip[0]
+    } else {
+      $internal_ip = $ip
+    }
+
+    $fqdn_name = join([$name, $base::zone], '.')
+    
+    host{$name:
       ensure => present,
-      ip => $ip,
-      name => "$name.adblockplus.org",

[Wladimir Palant, 2014/09/09 18:15:06]

Unfortunately, this isn't all that simple right now - some servers have names
that don't match their DNS name. For example, server4 is listed as server_4 in
DNS. So an additional (optional?) DNS name needs to be specified in hosts.yaml.

[mathias, 2014/10/08 03:02:33]

Done.

+      ip => $internal_ip,
+      name => $fqdn_name,
+      host_aliases => $dns ? {
+        undef => [],
+        default => $dns,
+      }  
     }
 
     if $ssh_public_key != undef {
-      @sshkey{$name:
+
+      $name_key = $dns ? {
+        undef => $fqdn_name,
+        default => $dns,
+      }
+
+      @sshkey {$name:
+        name => $name_key,
         key => $ssh_public_key,
         type => ssh-rsa,

[Wladimir Palant, 2014/09/09 18:15:06]

Not sure but I guess that the IP addresses of the host need to be specified as
host_aliases.

[mathias, 2014/10/08 03:02:33]

Done.

+        host_aliases => $ip,
       }
     }
+
   }
 }