Issue 3638 - Introduce class adblockplus::host

modules/base/manifests/init.pp

Index: modules/base/manifests/init.pp
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 2f6c1ddf286427ea82dc1448f76717cc7698a6a4..22efd6227c37f23695c4d3c883c93cd41563c463 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -45,9 +45,6 @@ class base ($zone='adblockplus.org') {
     stage => 'post'
   }
 
-  $servers = hiera('servers')
-  create_resources(base::explicit_host_record, $servers)
-
   define explicit_host_record(
     $ip,
     $ssh_public_key = undef,
@@ -56,33 +53,14 @@ class base ($zone='adblockplus.org') {
     $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,