From: Julien Cristau <jcristau@debian.org>
Date: Thu, 13 Aug 2015 12:01:10 +0000 (+0200)
Subject: merge duplicated entries for mipsel-manda-0[12]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=50b1efb57ab2125560ff24cacad2753e2947bdb2;p=mirror%2Fdsa-nagios.git

merge duplicated entries for mipsel-manda-0[12]
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fcef86e..57bcc8c 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -686,14 +686,6 @@ servers:
     address: 82.195.75.110
     parents: ganeti3
     hostgroups: computers, service, kvmdomains, jessie, hassrvfs, spamd, heavy-exim, highload
-  mipsel-manda-01:
-    address: 82.195.75.72
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
-  mipsel-manda-02:
-    address: 82.195.75.74
-    parents: gw-man-da
-    hostgroups: computers, hasbootfs, hassrvfs, buildd, jessie
   fils:
     address: 82.195.75.89
     parents: ganeti3
@@ -759,11 +751,11 @@ servers:
   mipsel-manda-01:
     address: 82.195.75.72
     parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   mipsel-manda-02:
     address: 82.195.75.74
     parents: gw-man-da
-    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid
+    hostgroups: computers, buildd, jessie, hassrvfs, sw-raid, hasbootfs
   # }}}
   # {{{ gw-marist
   zani: