From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri, 27 Sep 2019 06:59:21 +0000 (+0100)
Subject: Merge branch 'salsa' into fordsa
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e36aaa15b6e11c42c1f2fd23c28acbaae55a0355;hp=0f82767f57e613e31170d9885fc0503c18ed27a5;p=mirror%2Fdsa-puppet.git

Merge branch 'salsa' into fordsa
---

diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index be5d5de02..dbfb6fba2 100644
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,12 +1,12 @@
 class autofs {
 	case $::hostname {
-		pejacevic, piu-slave-bm-a, picconi, coccia, dillon, delfin, quantz, sor, mekeel, tate, respighi: {
+		pejacevic, piu-slave-bm-a, picconi, coccia, dillon, delfin, quantz, sor, tate, respighi: {
 			include autofs::bytemark
 		}
 		lw07,lw08: {
 			include autofs::leaseweb
 		}
-		tye,ullmann,piu-slave-ubc-01,hier,manziarly,lindsay,pinel,ticharich,donizetti: {
+		tye,ullmann,piu-slave-ubc-01,hier,manziarly,lindsay,pinel,ticharich,donizetti,mekeel: {
 			include autofs::ubc
 		}
 	}
diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 291aeb505..c8ee59798 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -102,11 +102,11 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
-		alias	mekeel
+		alias	OLD-mekeel
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341b39685c01000000
-		alias	mekeel-srv
+		alias	OLD-mekeel-srv
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341ca4655401000000
diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index 8359e9f37..9ffe42441 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -143,6 +143,15 @@ multipaths {
                 wwid 3600c0ff00027786c289d775d01000000
                 alias manziarly-lvm
         }
+        # mekeel
+        multipath {
+                wwid 3600c0ff000277c5f98a28d5d01000000
+                alias mekeel
+        }
+        multipath {
+                wwid 3600c0ff00027786c25a48d5d01000000
+                alias mekeel-lvm
+        }
         # menotti
         multipath {
                 wwid 3600c0ff00027786cec49e05701000000