prepare to add salieri to ganeti2

[dsa-puppet.git] / modules / ganeti2 / manifests / params.pp

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 29a5d011250682aa956c2a72f43e148cc43f2198..93414b75d166e5076fe2177b8809ce11f5fecc64 100644 (file)
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -1,6 +1,4 @@
 class ganeti2::params {
-
-       $cluster = hiera('cluster')
        case $cluster {
                'ganeti-osuosl.debian.org': {
                        $ganeti_hosts = ['140.211.166.20/32']
@@ -8,8 +6,8 @@ class ganeti2::params {
                        $drbd         = false
                }
                'ganeti2.debian.org': {
-                       $ganeti_hosts = ['206.12.19.213/32', '206.12.19.217/32', '206.12.19.212/32', '206.12.19.216/32', '206.12.19.19/32']
-                       $ganeti_priv  = ['192.168.2.213/32', '192.168.2.217/32', '192.168.2.212/32', '192.168.2.216/32', '192.168.2.19/32']
+                       $ganeti_hosts = ['206.12.19.213/32', '206.12.19.217/32', '206.12.19.212/32', '206.12.19.216/32', '206.12.19.19/32', '206.12.19.20/32', '206.12.19.218/32', '206.12.19.214/32']
+                       $ganeti_priv  = ['192.168.2.213/32', '192.168.2.217/32', '192.168.2.212/32', '192.168.2.216/32', '192.168.2.19/32', '192.168.2.20/32', '192.168.2.218/32', '192.168.2.214/32']
                        $drbd         = true
                }
                'ganeti3.debian.org': {
@@ -17,9 +15,9 @@ class ganeti2::params {
                        $ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
                        $drbd         = true
                }
-               'ganeti-bytemark.debian.org': {
-                       $ganeti_hosts = ['5.153.231.1/32', '5.153.231.9/32']
-                       $ganeti_priv  = ['192.168.231.1/32', '192.168.231.9/32']
+               'ganeti.bm.debian.org': {
+                       $ganeti_hosts = ['5.153.231.240/28']
+                       $ganeti_priv  = ['172.29.121.0/24']
                        $drbd         = false
                }
                default: {