3 files changed, 42 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
new file mode 100644
index 00000000..06cd5c01
--- /dev/null
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -0,0 +1,20 @@
+class site_config::hosts() {
+
+  $hosts = hiera('hosts','')
+  $hostname = hiera('name')
+
+  file { "/etc/hostname":
+    ensure => present,
+    content => $hostname
+  }
+
+  exec { "/bin/hostname $hostname":
+    subscribe   => [ File['/etc/hostname'], File['/etc/hosts'] ],
+    refreshonly => true;
+  }
+
+  file { '/etc/hosts':
+    content => template('site_config/hosts'),
+    mode    => '0644', owner => root, group => root;
+  }
+}
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index 7f67ad4e..bab186d0 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -11,4 +11,13 @@ class site_config {
 
   # configure /etc/resolv.conf
   include site_config::resolvconf
+
+  # configure /etc/hosts
+  stage { 'initial':
+    before => Stage['main'],
+  }
+
+  class { 'site_config::hosts':
+    stage => initial,
+  }
 }
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
new file mode 100644
index 00000000..c516eaf8
--- /dev/null
+++ b/puppet/modules/site_config/templates/hosts
@@ -0,0 +1,13 @@
+# This file is managed by puppet, any changes will be overwritten!
+
+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
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters