Change in vdsm[master]: multiapth conf: Replace TM to OVIRT

Yeela Kaplan has uploaded a new change for review.

Change subject: multiapth conf: Replace TM to OVIRT
......................................................................

multiapth conf: Replace TM to OVIRT

Change-Id: Icd27a02f9318f3e7814c5d971ed9e605651cf286
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com&gt;
---
M lib/vdsm/tool/configurators/multipath.py
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/37966/1

diff --git a/lib/vdsm/tool/configurators/multipath.py
b/lib/vdsm/tool/configurators/multipath.py
index 8f19196..2d08888 100644
--- a/lib/vdsm/tool/configurators/multipath.py
+++ b/lib/vdsm/tool/configurators/multipath.py
@@ -87,14 +87,15 @@
              "# RHEV REVISION 0.4", "# RHEV REVISION 0.5",
              "# RHEV REVISION 0.6", "# RHEV REVISION 0.7",
              "# RHEV REVISION 0.8", "# RHEV REVISION 0.9",
-             "# RHEV REVISION 1.0"]
+             "# RHEV REVISION 1.0", "# RHEV REVISION 1.1"]
 
-_MPATH_CONF_TAG = "# RHEV REVISION 1.1"
+_MPATH_CONF_TAG = "# OVIRT REVISION 1.2"
 
 # Having the PRIVATE_TAG in the conf file means
 # vdsm-tool should never change the conf file
 # even when using the --force flag
-_MPATH_CONF_PRIVATE_TAG = "# RHEV PRIVATE"
+_OLD_PRIVATE_TAG = "# RHEV PRIVATE"
+_MPATH_CONF_PRIVATE_TAG = "# OVIRT PRIVATE"
 
 _MPATH_CONF_TEMPLATE = _MPATH_CONF_TAG + _STRG_MPATH_CONF
 
@@ -161,7 +162,7 @@
             second = mpathconf[1]
         except IndexError:
             pass
-        if _MPATH_CONF_PRIVATE_TAG in second:
+        if _MPATH_CONF_PRIVATE_TAG in second or _OLD_PRIVATE_TAG in second:
             sys.stdout.write("Manual override for multipath.conf detected"
                              " - preserving current configuration\n")
             if _MPATH_CONF_TAG not in first:


-- 
To view, visit http://gerrit.ovirt.org/37966
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd27a02f9318f3e7814c5d971ed9e605651cf286
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com&gt;