From 88cd1cbe6fb0399461ed9f78d35f32160b85d29a Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Thu, 17 Oct 2013 15:32:20 +0200
Subject: [PATCH] Add FQDN to host name resolution, if available

---
 manifests/nameresolution.pp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/manifests/nameresolution.pp b/manifests/nameresolution.pp
index 0edd713..48dfb91 100644
--- a/manifests/nameresolution.pp
+++ b/manifests/nameresolution.pp
@@ -9,8 +9,15 @@ class kickstack::nameresolution inherits kickstack {
 
   case $::kickstack::name_resolution {
     'hosts': {
-      @@host { $hostname:
+      $host = pick($fqdn,$hostname)
+      if $fqdn {
+        $aliases = [ $hostname ]
+      } else {
+        $aliases = []
+      }
+      @@host { $host:
         ip => getvar("ipaddress_${::kickstack::nic_management}"),
+        host_aliases => $aliases,
         comment => 'Managed by Puppet',
         tag => 'hostname'
       }