X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Fparams.pp;h=b5df78ce864a6c5e893afec83d1e99b41753368f;hb=116904ab926b2cf89a21b0665785d3039ba7e29d;hp=f4b60bedc8f0d2b0efc75318373c90372813e995;hpb=95072525773d3ead4ac53220475f1f1d59ff2f84;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index f4b60bedc..b5df78ce8 100644
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -7,15 +7,25 @@
 #   include ganeti2::params
 #
 class ganeti2::params {
+	include stdlib
+
 	case $::cluster {
 		'ganeti-osuosl.debian.org': {
 			$ganeti_hosts = ['140.211.166.20/32']
 			$ganeti_priv  = ['140.211.166.20/32']
 			$drbd         = false
 		}
-		'ganeti3.debian.org': {
-			$ganeti_hosts = ['82.195.75.103/32', '82.195.75.109/32']
-			$ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
+		'ganeti2-osuosl.debian.org': {
+			$ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+			                getfromhash($deprecated::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
+			$ganeti_priv  = getfromhash($deprecated::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+			                getfromhash($deprecated::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
+			$drbd         = true
+		}
+		'ganeti.manda.debian.org': {
+			$ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'manda-node03.debian.org', 'ipHostNumber') +
+			                getfromhash($deprecated::allnodeinfo, 'manda-node04.debian.org', 'ipHostNumber')
+			$ganeti_priv  = ['172.29.182.13', '172.29.182.14']
 			$drbd         = true
 		}
 		'ganeti2.ubc.debian.org': {
@@ -43,6 +53,13 @@ class ganeti2::params {
 			$ganeti_priv  = ['172.29.184.11/32', '172.29.184.12/32']
 			$drbd         = true
 		}
+		'ganeti3.ubc.debian.org': {
+			$ganeti_hosts = getfromhash($deprecated::allnodeinfo, 'ubc-node-arm01.debian.org', 'ipHostNumber') +
+			                getfromhash($deprecated::allnodeinfo, 'ubc-node-arm02.debian.org', 'ipHostNumber') +
+			                getfromhash($deprecated::allnodeinfo, 'ubc-node-arm03.debian.org', 'ipHostNumber')
+			$ganeti_priv  = ['172.29.42.51', '172.29.42.52', '172.29.42.53']
+			$drbd         = true
+		}
 		default: {
 			$ganeti_hosts = []
 			$ganeti_priv  = []