From d360fc07cdc585491d7ef53f7e0fb5cc67d86ea9 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 6 May 2009 22:51:28 +0100 Subject: [PATCH] Some more nodeinfo Signed-off-by: Stephen Gran --- .../etc/puppet/lib/puppet/parser/functions/nodeinfo.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index d6535a267..ad29b6dc1 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -23,9 +23,19 @@ module Puppet::Parser::Functions 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') results['ldap'] = [] -- 2.20.1