Issue 122 - Puppet ENC via Hiera

modules/base/manifests/init.pp

-class base ($authority='adblockplus.org') {

[Felix Dahlke, 2015/03/03 16:43:32]

Wouldn't "zone" or maybe "domain" be a more fitting name here?

[mathias, 2015/03/04 12:32:37]

Indeed, let's go with $zone. $domain is much to over-used and not precise enough
anyway. Which is why we've tried to avoid it here in the first place.

+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,
     $role           = undef,
     $dns            = undef,
     $groups         = undef,

[Wladimir Palant, 2015/03/03 20:00:19]

This parameter is unused, why did you add it?

[mathias, 2015/03/04 12:32:37]

It's one of the allowed keywords in hosts.yaml, and used to accumulate e.g.
Nagios host-groups in modules/nagios/manifests/server.pp --

Unfortunately, create_resources() requires all key/value pairs to contain only
keys recognized by the resource type. Having unused parameters when processing
the data is the only way to introduce some flexibility here (without writing
Ruby code, at least).

   ) {
     
     if is_array($ip) {
       $internal_ip = $ip[0]
     } else {
       $internal_ip = $ip
     }
 
-    $fqdn_name = join([$name, $base::authority], ".")
+    $fqdn_name = join([$name, $base::zone], '.')
     
     host{$name:
       ensure => present,
       ip => $internal_ip,
       name => $fqdn_name,
       host_aliases => $dns ? {
         undef => [],
         default => $dns,
       }  
     }
 
     if $ssh_public_key != undef {
 
       $name_key = $dns ? {
         undef => $fqdn_name,
         default => $dns,
       }
 
       @sshkey {$name:
         name => $name_key,
         key => $ssh_public_key,
         type => ssh-rsa,
         host_aliases => $ip,
       }
     }
 
   }
 }