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

diff --git a/modules/ganeti2/manifests/params.pp b/modules/ganeti2/manifests/params.pp
index 5510fba9c..b5df78ce8 100644
--- a/modules/ganeti2/manifests/params.pp
+++ b/modules/ganeti2/manifests/params.pp
@@ -16,20 +16,15 @@ class ganeti2::params {
 			$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']
+			$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($site::allnodeinfo, 'manda-node03.debian.org', 'ipHostNumber') +
-			                getfromhash($site::allnodeinfo, 'manda-node04.debian.org', 'ipHostNumber')
+			$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
 		}
@@ -59,9 +54,9 @@ class ganeti2::params {
 			$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_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
 		}