From 8980a5a4c1e7dc6ea14a49b42333b9c4c82ff329 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 13 Feb 2015 17:40:21 +0100 Subject: [PATCH 1/1] ubc: Ignore sda on p410 blades --- modules/multipath/manifests/init.pp | 2 +- .../multipath-bm-os.conf.erb} | 0 .../multipath-bm.conf => templates/multipath-bm.conf.erb} | 0 .../multipath-ubc-ganeti.conf.erb} | 3 +++ 4 files changed, 4 insertions(+), 1 deletion(-) rename modules/multipath/{files/multipath-bm-os.conf => templates/multipath-bm-os.conf.erb} (100%) rename modules/multipath/{files/multipath-bm.conf => templates/multipath-bm.conf.erb} (100%) rename modules/multipath/{files/multipath-ubc-ganeti.conf => templates/multipath-ubc-ganeti.conf.erb} (97%) diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp index b9b9ffe5..7f6bf1b5 100644 --- a/modules/multipath/manifests/init.pp +++ b/modules/multipath/manifests/init.pp @@ -34,7 +34,7 @@ class multipath { } file { '/etc/multipath.conf': - source => "puppet:///modules/multipath/${conffile}", + content => template("multipath/${conffile}.erb"), notify => Exec['multipath reload'] } } diff --git a/modules/multipath/files/multipath-bm-os.conf b/modules/multipath/templates/multipath-bm-os.conf.erb similarity index 100% rename from modules/multipath/files/multipath-bm-os.conf rename to modules/multipath/templates/multipath-bm-os.conf.erb diff --git a/modules/multipath/files/multipath-bm.conf b/modules/multipath/templates/multipath-bm.conf.erb similarity index 100% rename from modules/multipath/files/multipath-bm.conf rename to modules/multipath/templates/multipath-bm.conf.erb diff --git a/modules/multipath/files/multipath-ubc-ganeti.conf b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb similarity index 97% rename from modules/multipath/files/multipath-ubc-ganeti.conf rename to modules/multipath/templates/multipath-ubc-ganeti.conf.erb index 03066d19..016d349b 100644 --- a/modules/multipath/files/multipath-ubc-ganeti.conf +++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb @@ -25,6 +25,9 @@ blacklist { devnode "^hd[a-z][[0-9]*]" devnode "^vd[a-z]" devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" +<%- if %w{pasquini tristano boito bertali}.include?(hostname) then -%> + devnode "^sda[0-9]*" +<%- end -%> device { vendor DEC.* product MSA[15]00 -- 2.39.2