From: Stephen Gran Date: Wed, 6 May 2009 22:18:41 +0000 (+0100) Subject: Comment all this out until we find the problem X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0428ca3f71b0e1568157f4d7fb05cfdc012dd35a;p=mirror%2Fdsa-puppet.git Comment all this out until we find the problem Signed-off-by: Stephen Gran --- diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index ad29b6dc1..7ffe5a064 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -21,20 +21,20 @@ module Puppet::Parser::Functions end end - results['bugsmaster'] = host == 'rietz.debian.org' - results['qamaster'] = host == 'merkel.debian.org' - results['mailrelay'] = host == 'spohr.debian.org' - 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 +# results['bugsmaster'] = host == 'rietz.debian.org' +# results['qamaster'] = host == 'merkel.debian.org' +# results['mailrelay'] = host == 'spohr.debian.org' +# 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 ldap = LDAP::Conn.new('db.debian.org')