Change in vdsm[master]: Update scsi_id options format and add devices to multipath.c...
ykaplan at redhat.com
ykaplan at redhat.com
Thu Oct 4 16:30:30 UTC 2012
Yeela Kaplan has uploaded a new change for review.
Change subject: Update scsi_id options format and add devices to multipath.conf
......................................................................
Update scsi_id options format and add devices to multipath.conf
Change-Id: I088ff2d4ff600ec9c1e784a43f3336e36ceb717d
Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=819745
Signed-off-by: Yeela Kaplan <ykaplan at redhat.com>
---
M vdsm/constants.py.in
M vdsm/storage/multipath.py
2 files changed, 24 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/8363/1
diff --git a/vdsm/constants.py.in b/vdsm/constants.py.in
index 80073a4..2d5b2b3 100644
--- a/vdsm/constants.py.in
+++ b/vdsm/constants.py.in
@@ -158,16 +158,26 @@
STRG_ISCSI_HOST = "iscsi_host/"
STRG_SCSI_HOST = "scsi_host/"
STRG_ISCSI_SESSION = "iscsi_session/"
-STRG_MPATH_CONF = """
-
-defaults {
- polling_interval 5
- getuid_callout "@SCSI_ID_PATH@ -g -u -d /dev/%n"
- no_path_retry fail
- user_friendly_names no
- flush_on_last_del yes
- fast_io_fail_tmo 5
- dev_loss_tmo 30
- max_fds 4096
-}
-"""
+STRG_MPATH_CONF = (
+"\n\n"
+"defaults {\n"
+" polling_interval 5\n"
+" getuid_callout \"@SCSI_ID_PATH@ --whitelisted "
+ "--replace-whitespace --device=/dev/%n\"\n"
+" no_path_retry fail\n"
+" user_friendly_names no\n"
+" flush_on_last_del yes\n"
+" fast_io_fail_tmo 5\n"
+" dev_loss_tmo 30\n"
+" max_fds 4096\n"
+"}\n"
+"\n"
+"devices {\n"
+"device {\n"
+" vendor \"HITACHI\"\n"
+" product \"DF.*\"\n"
+" getuid_callout \"@SCSI_ID_PATH@ --whitelisted "
+ "--replace-whitespace --device=/dev/%n\"\n"
+"}\n"
+"}"
+)
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 042b4f5..f84159b 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -50,7 +50,7 @@
OLD_TAGS = ["# RHAT REVISION 0.2", "# RHEV REVISION 0.3",
"# RHEV REVISION 0.4", "# RHEV REVISION 0.5",
"# RHEV REVISION 0.6"]
-MPATH_CONF_TAG = "# RHEV REVISION 0.7"
+MPATH_CONF_TAG = "# RHEV REVISION 0.8"
MPATH_CONF_PRIVATE_TAG = "# RHEV PRIVATE"
MPATH_CONF_TEMPLATE = MPATH_CONF_TAG + constants.STRG_MPATH_CONF
--
To view, visit http://gerrit.ovirt.org/8363
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I088ff2d4ff600ec9c1e784a43f3336e36ceb717d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan at redhat.com>
More information about the vdsm-patches
mailing list