X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=15810e85df4b7fe40b6f5c1f30b7aa5315c3122a;hb=3a18a2560244c20c7aa4fa4b8378821318f22f6b;hp=d5734dfd7fe97ddf3a668e89baa0a46ce751812b;hpb=c6872f30223f23afe81c6905a061a6a5c38a22f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index d5734dfd7..15810e85d 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -165,8 +165,9 @@
   dbs.join(' ')
 %>);
 
-@def $HOST_GANETI_V4 = (206.12.19.213/32 206.12.19.217/32);
-@def $HOST_DRBD_V4   = (192.168.2.213/32 192.168.2.217/32);
+# FIXME XXX we should get these from other information, and reconsider the places where we use them in destination matching rules
+@def $HOST_GANETI_V4           = (206.12.19.213/32 206.12.19.217/32 206.12.19.212/32 206.12.19.216/32);
+@def $HOST_GANETI_BACKEND_V4   = (192.168.2.213/32 192.168.2.217/32 192.168.2.212/32 192.168.2.216/32);
 
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
@@ -187,7 +188,7 @@
 @def $zobel   = ($zobel 195.49.152.0/22); # DG-i AS
 @def $zobel   = ($zobel 194.187.64.0/22); # DG-i AS
 @def $luca    = (64.71.152.109);
-@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
+@def $paravoid = (62.217.125.135); # scrooge.tty.gr
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 194.31.39.0/26); # office network
 @def $tfheen   = ($tfheen 195.159.200.122); # home
@@ -206,7 +207,7 @@
 @def $zobel6     = ($zobel6 2a01:198:6b2::/48); # AdS20
 @def $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
 @def $luca6      = ();
-@def $paravoid6  = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
+@def $paravoid6  = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2a02:c0:1013:1::/64); # Office
 @def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link