From 95d0c71fa4017a7908ccda0adae8057e2115cc42 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 11 Jun 2013 16:33:03 -0700 Subject: use hiera hashes for source data for /etc/hosts --- puppet/modules/site_config/templates/hosts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_config/templates/hosts') diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts index 00cc6a79..c2522367 100644 --- a/puppet/modules/site_config/templates/hosts +++ b/puppet/modules/site_config/templates/hosts @@ -1,10 +1,12 @@ # This file is managed by puppet, any changes will be overwritten! 127.0.0.1 localhost -127.0.1.1 <%= hostname %>.<%= @domain_public %> <%= hostname %> +127.0.1.1 <%= @hostname %>.<%= @domain_public %> <%= @hostname %> -<%- if hosts.to_s != '' then -%> -<%= hosts %> +<%- if @hosts then -%> +<% @hosts.each do |name, props| -%> +<%= props["ip_address"] %> <%= props["domain_full"] %>, <%= props["domain_internal"] %>, <%= name %> +<% end -%> <% end -%> # The following lines are desirable for IPv6 capable hosts -- cgit v1.2.3 From 722ff7da46de4e656b3a110a65b9ccaa57f82898 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 11 Jun 2013 23:22:57 -0700 Subject: /etc/hosts must not have commas!! --- puppet/modules/site_config/templates/hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_config/templates/hosts') diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts index c2522367..2c784b05 100644 --- a/puppet/modules/site_config/templates/hosts +++ b/puppet/modules/site_config/templates/hosts @@ -5,7 +5,7 @@ <%- if @hosts then -%> <% @hosts.each do |name, props| -%> -<%= props["ip_address"] %> <%= props["domain_full"] %>, <%= props["domain_internal"] %>, <%= name %> +<%= props["ip_address"] %> <%= props["domain_full"] %> <%= props["domain_internal"] %> <%= name %> <% end -%> <% end -%> -- cgit v1.2.3