summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/templates/hosts
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-12-11 15:37:15 -0500
committerMicah Anderson <micah@riseup.net>2012-12-11 15:41:17 -0500
commitcbb834da5de7e2abe7399e34766492bfab48fa9c (patch)
tree23fee326a81aa7473731446b59322e5df7525ed8 /puppet/modules/site_config/templates/hosts
parent090dca27921efe22fdc39c8598356bfb74e5fe99 (diff)
test to see if the hosts value is empty before trying to reference it in a template
also set the hostname to what the hiera 'name' is set to
Diffstat (limited to 'puppet/modules/site_config/templates/hosts')
-rw-r--r--puppet/modules/site_config/templates/hosts6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
index 1a12addc..c516eaf8 100644
--- a/puppet/modules/site_config/templates/hosts
+++ b/puppet/modules/site_config/templates/hosts
@@ -1,7 +1,9 @@
# This file is managed by puppet, any changes will be overwritten!
-127.0.0.1 localhost
-<%= scope.function_hiera('hosts') %>
+127.0.0.1 localhost
+<%- if hosts.to_s != '' then -%>
+<%= hosts %>
+<% end -%>
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback