X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=19a64b5bfda09f9aaa294da5d111410ac71f5152;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=75c7bcd3b82994fa350ed3ca5aa624eb370439b1;hpb=b4ac9308608e43cf12b4609b57f8dee9b254e049;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp
index 75c7bcd3b..19a64b5bf 100644
--- a/modules/site/manifests/init.pp
+++ b/modules/site/manifests/init.pp
@@ -1,13 +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('*', '/etc/puppet/modules/debian_org/misc/local.yaml')
+	$nodeinfo  = nodeinfo($::fqdn, '/etc/puppet/modules/debian_org/misc/local.yaml')
 	$allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
-	notice( sprintf('hoster for %s is %s', $::fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
-	notice( sprintf('buildd status for %s is %s', $::fqdn, getfromhash($nodeinfo, 'buildd') ) )
+        $roles = hiera('roles')
 
 	service { 'procps':
 		hasstatus   => false,
 		status      => '/bin/true',
 	}
+
 }