X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdsa_lvm%2Fmanifests%2Finit.pp;h=6cc7e014f5fc130856f52bcd25cd5bef02652c73;hb=6f170969f00763a6592413d200b598414cc283e9;hp=1c1a5326026048f9b0bace3a9bba57de990f3118;hpb=c2fc9ef577528adc0d54f87640f658c32584738d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp
index 1c1a53260..6cc7e014f 100644
--- a/modules/dsa_lvm/manifests/init.pp
+++ b/modules/dsa_lvm/manifests/init.pp
@@ -1,25 +1,39 @@
 class dsa_lvm {
-	case $::hostname {
-		'ubc-bl8','ubc-bl4': {
-			$conffile = 'lvm-ubc-ganeti.conf'
-		}
-		'ubc-bl3','ubc-bl7','ubc-bl2','ubc-bl6': {
-			$conffile = 'lvm-ubc-ganeti-p410.conf'
-		}
-		'csail-node01','csail-node02': {
-			$conffile = 'lvm-csail-nodeX-ganeti.conf'
-		}
-		'grnet-node01','grnet-node02': {
-			$conffile = 'lvm-grnet-nodeX-ganeti.conf'
-		}
-		'bm-bl1','bm-bl2','bm-bl3','bm-bl4','bm-bl5','bm-bl6','bm-bl7','bm-bl8','bm-bl9','bm-bl10','bm-bl11','bm-bl12': {
-			$conffile = 'lvm-bm-blades.conf'
-		}
-		'prokofiev': {
-			$conffile = 'lvm-prokofiev.conf'
+	case $::cluster {
+		'ganeti.manda.debian.org': {
+			$conffile = 'lvm-ganeti.manda.debian.org.conf'
 		}
 		default: {
-			$conffile = ''
+			case $::hostname {
+				'csail-node01','csail-node02': {
+					$conffile = 'lvm-csail-nodeX-ganeti.conf'
+				}
+				'grnet-node01','grnet-node02': {
+					$conffile = 'lvm-grnet-nodeX-ganeti.conf'
+				}
+				'bm-bl1','bm-bl2','bm-bl3','bm-bl4','bm-bl5','bm-bl6','bm-bl7','bm-bl8','bm-bl9','bm-bl10','bm-bl11','bm-bl12','bm-bl13','bm-bl14': {
+					$conffile = 'lvm-bm-blades.conf'
+				}
+				'prokofiev': {
+					$conffile = 'lvm-prokofiev.conf'
+				}
+				'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
+					$conffile = 'lvm-ubc-ganeti2.conf'
+				}
+				'conova-node01','conova-node02': {
+					$conffile = 'lvm-conova-ganeti.conf'
+				}
+				'pieta', 'pijper': {
+					$conffile = 'lvm-osuosl-ganeti2.conf'
+				}
+				'ubc-node-arm01','ubc-node-arm02','ubc-node-arm03': {
+					$conffile = 'lvm-ubc-ganeti3.conf'
+				}
+
+				default: {
+					$conffile = ''
+				}
+			}
 		}
 	}