X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdsa_lvm%2Fmanifests%2Finit.pp;h=3ce1795ac01849729b07e8c9de2b42554ab16297;hb=95072525773d3ead4ac53220475f1f1d59ff2f84;hp=0a295fdb975d3a49ec365afffeb7ea51069cb01a;hpb=ec54641f303fe77b391c5cc5846946f78ca66397;p=mirror%2Fdsa-puppet.git

diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp
index 0a295fdb9..3ce1795ac 100644
--- a/modules/dsa_lvm/manifests/init.pp
+++ b/modules/dsa_lvm/manifests/init.pp
@@ -1,11 +1,5 @@
 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'
 		}
@@ -21,9 +15,12 @@ class dsa_lvm {
 		'clementi','czerny': {
 			$conffile = 'lvm-manda-ganeti.conf'
 		}
-		'ubc-enc2bl1','ubc-enc2bl2','ubc-enc2bl9','ubc-enc2bl10': {
+		'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
 			$conffile = 'lvm-ubc-ganeti2.conf'
 		}
+		'conova-node01','conova-node02': {
+			$conffile = 'lvm-conova-ganeti.conf'
+		}
 		default: {
 			$conffile = ''
 		}