Revert "Change hoster.yaml to allow for more keys in the future"

This reverts commit af54a28ce3583c22c02a9e59277bb173fb1704f1.

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index e4ad017a2d874f87b6a53576e3ce573625a911b6..f3bdce54a911ce19667633d74f3de3e44217d22f 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -1,117 +1,84 @@
 ---
 1und1-sec:
-  netrange:
-    - 195.20.242.64/26
-    - 212.227.126.32/27
-    - 2001:8d8:2:1::/64
+  - 195.20.242.64/26
+  - 212.227.126.32/27
+  - 2001:8d8:2:1::/64
 1und1:
-  netrange:
-    - 87.106.0.0/16
-    - 2001:8d8:81:1520::/64
+  - 87.106.0.0/16
+  - 2001:8d8:81:1520::/64
 aacumea:
-  netrange:
-    - 130.236.0.0/14
-    - 2001:06B0:000E::/48
+  - 130.236.0.0/14
+  - 2001:06B0:000E::/48
 # Australian National University (ana.edu.au)
 ana:
-  netrange:
-    - 150.203.164.0/24
-    - 2001:388:1034:2900::64
+  - 150.203.164.0/24
+  - 2001:388:1034:2900::64
 arm:
-  netrange:
-    - 217.140.96.58/29
+  - 217.140.96.58/29
 br:
   # University Federal do Parana (.br)
-  netrange:
-    - 200.17.192.0/19
+  - 200.17.192.0/19
 brainfood:
-  netrange:
-    - 70.103.162.0/24
+  - 70.103.162.0/24
 brown:
-  netrange:
-    - 128.148.0.0/16
+  - 128.148.0.0/16
 carnet:
-  netrange:
-    - 193.198.0.0/16
+  - 193.198.0.0/16
 csail:
-  netrange:
-    - 128.31.0.0/24
+  - 128.31.0.0/24
 cst:
-  netrange:
-    - 213.188.99.208/28
+  - 213.188.99.208/28
 darmstadt:
-  netrange:
-    - 82.195.75.64/26
-    - 82.195.75.32/28
-    - 2001:41b8:202:deb::/64
+  - 82.195.75.64/26
+  - 82.195.75.32/28
+  - 2001:41b8:202:deb::/64
 dgi:
-  netrange:
-    - 93.94.130.128/26
+  - 93.94.130.128/26
 freenet:
-  netrange:
-    - 62.104.0.0/16
+  - 62.104.0.0/16
 ftcollins:
-  netrange:
-    - 192.25.206.0/24
+  - 192.25.206.0/24
 grnet:
-  netrange:
-    - 194.177.211.192/27
-    - 2001:648:2ffc:deb::/64
+  - 194.177.211.192/27
+  - 2001:648:2ffc:deb::/64
 helsinki:
-  netrange:
-    - 193.167.160.0/23
+  - 193.167.160.0/23
 isc:
-  netrange:
-    - 149.20.0.0/16
-    - 2001:4F8::/32
+  - 149.20.0.0/16
+  - 2001:4F8::/32
 nmmn:
-  netrange:
-    - 217.114.76.80/29
+  - 217.114.76.80/29
 osousl:
-  netrange:
-    - 140.211.166.0/25
-    - 140.211.15.0/24
+  - 140.211.166.0/25
+  - 140.211.15.0/24
 sanger:
-  netrange:
-    - 193.62.202.24/29
+  - 193.62.202.24/29
 rapidswitch:
-  netrange:
-    - 193.201.200.0/23
+  - 193.201.200.0/23
 sil:
-  netrange:
-    - 86.59.118.144/28
+  - 86.59.118.144/28
 scanplus:
-  netrange:
-    - 212.211.132.0/26
-    - 212.211.132.248/29
-    - 2001:a78::/64
+  - 212.211.132.0/26
+  - 212.211.132.248/29
+  - 2001:a78::/64
 snowman:
-  netrange:
-    - 72.66.115.54
+  - 72.66.115.54
 telegrafxs4all:
-  netrange:
-    - 82.94.249.152/29
+  - 82.94.249.152/29
 ubcece:
-  netrange:
-    - 137.82.84.64/27
-    - 206.12.19.0/24
+  - 137.82.84.64/27
+  - 206.12.19.0/24
 ugent:
-  netrange:
-    - 157.193.0.0/16
+  - 157.193.0.0/16
 umn:
-  netrange:
-    - 128.101.240.212
+  - 128.101.240.212
 utwente:
-  netrange:
-    - 130.89.0.0/16
-    - 2001:0610:1908::/48
+  - 130.89.0.0/16
+  - 2001:0610:1908::/48
 xs4all:
-  netrange:
-    - 194.109.137.216/29
-    - 2001:888:2000:12::/64
+  - 194.109.137.216/29
+  - 2001:888:2000:12::/64
 ynic:
-  netrange:
-    - 144.32.168.64/28
+  - 144.32.168.64/28
 zivit:
-  netrange:
-    - 80.245.144.0/22
+  - 80.245.144.0/22

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 2835cef2d3f8d8ea0b62a4bd679c279db90a32e5..c2bda8c4aa05db1fdf7052d5ef4dbb0e427515cd 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -15,11 +15,9 @@ module Puppet::Parser::Functions
     if (nodeinfo['ldap'].has_key?('ipHostNumber'))
       nodeinfo['ldap']['ipHostNumber'].each do |addr|
         yaml.keys.each do |hoster|
-          if yaml[hoster].has_key?'netrange'
-            yaml[hoster]['netrange'].each do |net|
-              if IPAddr.new(net).include?(addr)
-                return hoster
-              end
+          yaml[hoster].each do |net|
+            if IPAddr.new(net).include?(addr)
+              ans = hoster
             end
           end
         end
@@ -28,6 +26,3 @@ module Puppet::Parser::Functions
     return ans
   end
 end
-# vim:set ts=2:
-# vim:set et:
-# vim:set shiftwidth=2: