add params for ganeti

[dsa-puppet.git] / modules / ferm / templates / defs.conf.erb

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 15c50157a76dcb0df795a8cc7909e664d7c36fcc..e19c00e60228a7b35fdba6d3f3e95814f9b9b3dd 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -165,13 +165,6 @@
   dbs.join(' ')
 %>);
 
-# 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_GANETI_MANDA_V4          = (82.195.75.103/32 82.195.75.109/32);
-@def $HOST_GANETI_MANDA_BACKEND_V4 = (192.168.75.103/32 192.168.75.109/32);
-
-
 @def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
 
 @def $sgran   = (91.103.132.24/29 85.158.45.51/32);