X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fdakmaster%2Fconf-builddlist.erb;h=15b3b8c38d92bd0b8c8ec6514656e87f5458e318;hb=HEAD;hp=d216cdc9a9ca803261aeb78cc123b60e04b6cb77;hpb=9864e5713cbcc0d970940db2b90931c6ca0dc96c;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/dakmaster/conf-builddlist.erb b/modules/roles/templates/dakmaster/conf-builddlist.erb index d216cdc9a..15b3b8c38 100644 --- a/modules/roles/templates/dakmaster/conf-builddlist.erb +++ b/modules/roles/templates/dakmaster/conf-builddlist.erb @@ -8,12 +8,12 @@ <%= lines = [] - scope.lookupvar('site::allnodeinfo').keys.sort.each do |node| - next unless scope.lookupvar('site::allnodeinfo')[node]['purpose'] - if scope.lookupvar('site::allnodeinfo')[node]['purpose'].include?('buildd') - lines << " # #{scope.lookupvar('site::allnodeinfo')[node]['hostname'].to_s}" - scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |addr| - lines << " allow from #{addr}" + scope.lookupvar('deprecated::allnodeinfo').keys.sort.each do |node| + next unless scope.lookupvar('deprecated::allnodeinfo')[node]['purpose'] + if scope.lookupvar('deprecated::allnodeinfo')[node]['purpose'].include?('buildd') + lines << " # #{scope.lookupvar('deprecated::allnodeinfo')[node]['hostname'][0]}" + scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].each do |addr| + lines << " Require ip #{addr}" end end end