X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=2f9dc69419e28e940713f1bd452860da39dabba1;hb=4c031bc2c3d1d6ddc9f2478bf9c68cffbb5e1d9e;hp=2c6dab53ba949d7d274abe814df0b1bfabad8b75;hpb=43cee63d6c246596d9e545948255750f9cf3a580;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 2c6dab53b..2f9dc6941 100644
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,12 +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') ) )
+        $roles = hiera('roles')
 
 	service { 'procps':
 		hasstatus   => false,
 		status      => '/bin/true',
 	}
+
 }