X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Fparams.pp;h=93414b75d166e5076fe2177b8809ce11f5fecc64;hb=df11d54a271217ab177aab7e1fac339a8478e130;hp=77d892843ee31d7f41384f957a157a92a5b83da0;hpb=db14d5ab5528a3d2be5b8e32ba4ce4ca28963bdc;p=dsa-puppet.git

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 77d89284..93414b75 100644
--- 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,7 +15,7 @@ class ganeti2::params {
 			$ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
 			$drbd         = true
 		}
-		'ganeti-bm.debian.org': {
+		'ganeti.bm.debian.org': {
 			$ganeti_hosts = ['5.153.231.240/28']
 			$ganeti_priv  = ['172.29.121.0/24']
 			$drbd         = false