Merge branch 'salsa' into fordsa

diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index be5d5de..dbfb6fb 100644 (file)
--- 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 291aeb5..c8ee597 100644 (file)
--- 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 8359e9f..9ffe424 100644 (file)
--- 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