X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=2f9dc69419e28e940713f1bd452860da39dabba1;hb=600b3651dfb7fe1c4016debdfbd7d035a39b79c1;hp=21f9576f030220a0ec634fd15c51ad6bc33cce88;hpb=39b1f47c9704e1f143714bec6800a26a27911572;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 21f9576f0..2f9dc6941 100644
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,14 +1,13 @@
 class site {
 
-	$localinfo = yamlinfo('*', '/etc/puppet/modules/debian-org/misc/local.yaml')
-	$nodeinfo  = nodeinfo($::fqdn, '/etc/puppet/modules/debian-org/misc/local.yaml')
+	$localinfo = yamlinfo('*')
+	$nodeinfo  = nodeinfo($::fqdn)
 	$allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
-	notice( sprintf('hoster for %s is %s', $::fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
-	notice( sprintf('facter hoster for %s is %s', $::fqdn, $::hoster) )
-	notice( sprintf('hiera resolver for %s is %s', $::fqdn, join_spc(hiera('nameservers') ) ) )
+        $roles = hiera('roles')
 
 	service { 'procps':
 		hasstatus   => false,
 		status      => '/bin/true',
 	}
+
 }