X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Finit.pp;h=2f9dc69419e28e940713f1bd452860da39dabba1;hb=600b3651dfb7fe1c4016debdfbd7d035a39b79c1;hp=4d09074a996ced0b55f4627e51f32acc19261b51;hpb=f36a2bfe59eba5e6eec40dc385bd6e288af74d4b;p=mirror%2Fdsa-puppet.git diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp index 4d09074a9..2f9dc6941 100644 --- a/modules/site/manifests/init.pp +++ b/modules/site/manifests/init.pp @@ -1,8 +1,9 @@ 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') + $roles = hiera('roles') service { 'procps': hasstatus => false,