X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=2f9dc69419e28e940713f1bd452860da39dabba1;hb=b6527ce00278fa0b57893dd148768f0b0481ad3a;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..2f9dc6941 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('*') + $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('buildd status for %s is %s', $::fqdn, getfromhash($nodeinfo, 'buildd') ) ) + $roles = hiera('roles') service { 'procps': hasstatus => false, status => '/bin/true', } + }