From: Stephen Gran Date: Wed, 6 May 2009 22:42:03 +0000 (+0100) Subject: Revert "Let's try this" X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9de308f6133b7b68152cc854ba7444d930b84e3a;p=mirror%2Fdsa-puppet.git Revert "Let's try this" This reverts commit f69f9d158803c2007f1a3dfcfaf06a972d94046b. --- diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index abc08de0f..aae67bce2 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -27,10 +27,10 @@ module Puppet::Parser::Functions results['rtmaster'] = host == 'spohr.debian.org' results['packagesmaster'] = host == 'powell.debian.org' - nodeinfo['reservedaddrs'] = case host - when "ball.debian.org": '0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5' - else '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5' - end +# nodeinfo['reservedaddrs'] = case host +# when "ball.debian.org": '0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5' +# else '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5' +# end ldap = LDAP::Conn.new('db.debian.org')