From: Stephen Gran Date: Wed, 6 May 2009 22:38:21 +0000 (+0100) Subject: Start with the simple case X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=34e4b4b2549a77dd26f733e9bd41133e0e8cf216;p=mirror%2Fdsa-puppet.git Start with the simple case 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 7ffe5a064..aae67bce2 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -21,19 +21,15 @@ 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' -# + 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" +# 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')