Issue 3638 - Introduce class adblockplus::host

modules/base/manifests/init.pp

 class base ($zone='adblockplus.org') {
   stage {'pre': before => Stage['main']}
   stage {'post': require => Stage['main']}
 
   class {'users':
     stage => 'pre',
   }
 
   if !defined(Class['apt']) {
     class {'apt':
@@ skipping 27 matching lines @@
 
   service {'cron':
     ensure => running,
     enable => true,
   }
 
   class {'logrotate':
     stage => 'post'
   }
 
-  $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,
   ) {
 
-    if is_array($ip) {
-      $internal_ip = $ip[0]
-    } else {
-      $internal_ip = $ip
-    }
-
-    $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,
+        undef => $name,
         default => $dns,
       }
 
-      @sshkey {$name:
-        name => $name_key,
+      @sshkey {$name_key:
         key => $ssh_public_key,
         type => ssh-rsa,
         host_aliases => $ip,
         tag => 'base::explicit_host_record',
       }
     }
   }
 
   # Work around https://projects.puppetlabs.com/issues/4145
   Sshkey<| |> ->
   file {'/etc/ssh/ssh_known_hosts':
     ensure => 'present',
     mode => 0644,
   }
 
   # Work around https://issues.adblockplus.org/ticket/3479
   if $::environment == 'development' {
 
     file {
       '/etc/ssh/ssh_host_rsa_key':
         source => 'puppet:///modules/base/development_host_rsa_key',
         mode => 600,
         notify => Service['ssh'];
       '/etc/ssh/ssh_host_rsa_key.pub':
         source => 'puppet:///modules/base/development_host_rsa_key.pub',
         mode => 644;
     }
   }
 }