X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fganeti2%2Fmanifests%2Fparams.pp;h=5510fba9cb204ed9afaed878da52a40f52bf0127;hb=600b3651dfb7fe1c4016debdfbd7d035a39b79c1;hp=f4b60bedc8f0d2b0efc75318373c90372813e995;hpb=40676ab4e5a91665f557f34f944bae430f9b4eb0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index f4b60bedc..5510fba9c 100644
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -7,17 +7,32 @@
 #   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-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': {
 			$ganeti_hosts = ['82.195.75.103/32', '82.195.75.109/32']
 			$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']
@@ -43,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  = []