X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdsa_lvm%2Fmanifests%2Finit.pp;h=594c18f1dee5e83f4236ca71722cd76dc982db2c;hb=e0514e22dec30f2478263cb6e609f34d433f9d70;hp=345e411e0fd4fb90f825495ffbc7b54887a76a38;hpb=6cd0b2c073d84a7e4ba19161ebee856bcd8d2960;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp
index 345e411e0..594c18f1d 100644
--- a/modules/dsa_lvm/manifests/init.pp
+++ b/modules/dsa_lvm/manifests/init.pp
@@ -1,25 +1,38 @@
 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'
+				}
+				'clementi','czerny': {
+					$conffile = 'lvm-manda-ganeti3.conf'
+				}
+				'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
+					$conffile = 'lvm-ubc-ganeti2.conf'
+				}
+				'conova-node01','conova-node02': {
+					$conffile = 'lvm-conova-ganeti.conf'
+				}
+				'pijper': {
+					$conffile = 'lvm-osuosl-ganeti2.conf'
+				}
+				default: {
+					$conffile = ''
+				}
+			}
 		}
 	}
 
@@ -29,7 +42,8 @@ class dsa_lvm {
 		}
 
 		file { '/etc/lvm/lvm.conf':
-			source  => "puppet:///modules/dsa_lvm/$conffile",
+			ensure => file,
+			source => "puppet:///modules/dsa_lvm/${conffile}",
 		}
 	}
 }