New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/735
commit 0081046940d86f1b86d387213b38e63ea1653027
Author: Saggi Mizrahi <smizrahi(a)redhat.com>
Date: Sun Jul 24 18:54:14 2011 +0300
Related BZ#720911 - Read user defincd device only once
Change-Id: Id0a36cf53d6497ab19f3d1c02a9375cd0d1fead5
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index ef60c02..600a50f 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -200,13 +200,13 @@ VAR_RUN_VDSM = constants.P_VDSM_RUN
VDSM_LVM_SYSTEM_DIR = os.path.join(VAR_RUN_VDSM, "lvm")
VDSM_LVM_CONF = os.path.join(VDSM_LVM_SYSTEM_DIR, "lvm.conf")
+try:
+ USER_DEV_LIST = config.config.get("irs",
"lvm_dev_whitelist").split(",")
+except config.ConfigParser.Error:
+ USER_DEV_LIST = []
def buildFilter(autodevList):
- try:
- userDevList = config.config.get("irs",
"lvm_dev_whitelist").split(",")
- except config.ConfigParser.Error:
- userDevList = []
- devList = userDevList + autodevList
+ devList = USER_DEV_LIST + autodevList
devList.sort()
filt = '|'.join([dev.strip() for dev in devList if dev.strip()])
if len(filt) > 0: