X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Fparams.pp;h=5510fba9cb204ed9afaed878da52a40f52bf0127;hb=c22e8e353aebe49d0ec46c6232b4e6cdaa824b36;hp=7740b12f03d2b50fdea7e396f6dda91f46fbb1de;hpb=af61d497fc3d3112b4ec00f09ad5fce24f17dfc7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 7740b12f0..5510fba9c 100644
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -7,15 +7,19 @@
 #   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
 		}
-		'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', '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']
+		'ganeti2-osuosl.debian.org': {
+			$ganeti_hosts = getfromhash($site::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+			                getfromhash($site::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
+			$ganeti_priv  = getfromhash($site::allnodeinfo, 'pijper.debian.org', 'ipHostNumber') +
+			                getfromhash($site::allnodeinfo, 'pieta.debian.org', 'ipHostNumber')
 			$drbd         = true
 		}
 		'ganeti3.debian.org': {
@@ -23,6 +27,12 @@ class ganeti2::params {
 			$ganeti_priv  = ['192.168.75.103/32', '192.168.75.109/32']
 			$drbd         = true
 		}
+		'ganeti.manda.debian.org': {
+			$ganeti_hosts = getfromhash($site::allnodeinfo, 'manda-node03.debian.org', 'ipHostNumber') +
+			                getfromhash($site::allnodeinfo, 'manda-node04.debian.org', 'ipHostNumber')
+			$ganeti_priv  = ['172.29.182.13', '172.29.182.14']
+			$drbd         = true
+		}
 		'ganeti2.ubc.debian.org': {
 			$ganeti_hosts = ['209.87.16.1/32', '209.87.16.2/32', '209.87.16.3/32', '209.87.16.4/32', '209.87.16.5/32', '209.87.16.6/32', '209.87.16.7/32', '209.87.16.8/32', '209.87.16.9/32', '209.87.16.10/32', '209.87.16.11/32', '209.87.16.12/32', '209.87.16.13/32', '209.87.16.14/32', '209.87.16.15/32', '209.87.16.16/32']
 			$ganeti_priv  = ['172.29.42.1/32', '172.29.42.2/32', '172.29.42.3/32', '172.29.42.4/32', '172.29.42.5/32', '172.29.42.6/32', '172.29.42.7/32', '172.29.42.8/32', '172.29.42.9/32', '172.29.42.10/32', '172.29.42.11/32', '172.29.42.12/32', '172.29.42.13/32', '172.29.42.14/32', '172.29.42.15/32', '172.29.42.16/32']
@@ -48,6 +58,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($site::allnodeinfo, 'ubc-node-arm01.debian.org', 'ipHostNumber') +
+			                getfromhash($site::allnodeinfo, 'ubc-node-arm02.debian.org', 'ipHostNumber') +
+			                getfromhash($site::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  = []