From ed115a4983aaf09c9a3cae2041e8c1468161639a Mon Sep 17 00:00:00 2001
From: johjuhyun <juhyun.joh@samsung.com>
Date: Wed, 11 Apr 2018 18:15:55 +0900
Subject: [PATCH] Reset multipath.conf

Current multipath.conf is just for IBM Storwize SVC model, not
generally applicable setting. With this nova-compute may encounter
error when execute 'multipath -l /dev/sda' because sda is defined
as blacklist in conf.

This patch reset the conf file back to default which is same to the
result of 'mpathconf --enable'. Vendor dependent parameters should
be configured separately.

Change-Id: I429e5a6e2a37d9db56d59f88cdbfab12db4813a8
Signed-off-by: Minho Ban <mhban@samsung.com>
---
 ansible/roles/multipathd/templates/multipath.conf.j2 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/multipathd/templates/multipath.conf.j2 b/ansible/roles/multipathd/templates/multipath.conf.j2
index d063f31a87..749c07fed4 100644
--- a/ansible/roles/multipathd/templates/multipath.conf.j2
+++ b/ansible/roles/multipathd/templates/multipath.conf.j2
@@ -1,11 +1,7 @@
 defaults {
-   user_friendly_names no
-   polling_interval  30
+   user_friendly_names yes
+   find_multipaths yes
 }
 
 blacklist {
-    devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
-    devnode "^sd[a]"
-    devnode "^hd[a-z]"
-    devnode "^cciss!c[0-9]d[0-9]*"
 }