Move geo2, lotti, muffat and sonntag from ganeti2.d.o to ganeti2.ubc.d.o

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fc2fe88..01263e3 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -947,10 +947,6 @@ servers:
     address: 206.12.19.118
     parents: ganeti2
     hostgroups: computers, general, apache2-hosts, kvmdomains, apache-https, jessie
-  geo2:
-    address: 206.12.19.113
-    parents: ganeti2
-    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -963,10 +959,6 @@ servers:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  lotti:
-    address: 206.12.19.121
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
   glinka:
     address: 206.12.19.126
     parents: ganeti2
@@ -983,14 +975,6 @@ servers:
     address: 206.12.19.141
     parents: ganeti2
     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, nfs-client, apache2-hosts, autofs, apache-https
-  sonntag:
-    address: 206.12.19.142
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
-  muffat:
-    address: 206.12.19.146
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
   buxtehude:
     address: 206.12.19.147
     parents: ganeti2
@@ -1059,6 +1043,22 @@ servers:
     address: 209.87.16.30
     parents: ubc-gateway
     hostgroups: computers, service, kvmdomains, jessie, postgres94-hosts, xinetd-hosts
+  geo2:
+    address: 209.87.16.31
+    parents: ubc-gateway
+    hostgroups: computers, service, bind9-hosts, kvmdomains, jessie
+  lotti:
+    address: 209.87.16.33
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, hassrvfs
+  muffat:
+    address: 209.87.16.30
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, spamd, heavy-exim, mail-relay
+  sonntag:
+    address: 209.87.16.34
+    parents: ubc-gateway
+    hostgroups: computers, service, kvmdomains, jessie, nfs-client, autofs
   # }}}
   # {{{ gw-umn
   #saens: