From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 17 Jul 2016 10:12:34 +0000 (+0200)
Subject: caballero is gone
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a6850ed3ff8b5d23cc4fbd7beb391545a8d7f489;p=mirror%2Fdsa-puppet.git

caballero is gone
---

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index 2f4552e6c..b7be18917 100644
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -153,10 +153,6 @@ sanger:
   mirror-debian: http://mirror.bytemark.co.uk/debian/
   nameservers: [193.62.202.28, 193.62.202.29]
   searchpaths: [debprivate-sanger.debian.org]
-rapidswitch:
-  netrange:
-    - 193.201.200.0/23
-  nameservers: [87.117.198.200, 87.117.237.100, 87.117.196.200]
 scanplus:
   netrange:
     - 212.211.132.0/26
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 62f3945df..57ba91f0b 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -183,7 +183,6 @@ host_settings:
     - arm-linaro-03.debian.org
     - arnold.debian.org
     - babin.debian.org
-    - caballero.debian.org
     - eberlin.debian.org
     - fano.debian.org
     - fayrfax.debian.org
diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 4555dc901..0ee8d170a 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -13,11 +13,6 @@ roles['extranrpeclient'].each do |nag|
 	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
 end
 
-case fqdn when
-  'caballero.debian.org' then
-    nagii << '192.34.35.49'
-end
-
 out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
 out
 %>