Change in vdsm[ovirt-3.6]: init: configure multipath on upgrade from ovirt-3.3 and 3.4
ykaplan at redhat.com
ykaplan at redhat.com
Tue Dec 1 10:57:30 UTC 2015
Hello Piotr Kliczewski, Yaniv Bronhaim,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/49510
to review the following change.
Change subject: init: configure multipath on upgrade from ovirt-3.3 and 3.4
......................................................................
init: configure multipath on upgrade from ovirt-3.3 and 3.4
multipath configurator was added to vdsm-tool in ovirt-3.6.
In case we upgrade from ovirt-3.3 and ovirt-3.4 we now run configure
of module multipath in init script (in addition to running it
for upgrade from ovirt-3.5).
Change-Id: If307e37397adf99e8a2c3508c8f953507db3f37b
Signed-off-by: Yeela Kaplan <ykaplan at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/48106
Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
Continuous-Integration: Jenkins CI
Reviewed-by: Piotr Kliczewski <piotr.kliczewski at gmail.com>
---
M init/vdsmd_init_common.sh.in
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/49510/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index decb694..90a172d 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -259,11 +259,10 @@
# by running manual configure command
"$VDSM_TOOL" configure --force
ret=$?
- elif grep -q '^vdsm-4\.16\.' "${upgraded_ver_file}"; then
- # REQUIRED_FOR upgrade from vdsm-4.16.z
- # Both mutlipath and sasl password were configured in 4.16 as
- # part of the installation - see vdsm-4.16 spec. Since 4.17 the
- # logic moved to vdsm-tool
+ elif grep -qE '^vdsm-4\.(13|14|16)\.' "${upgraded_ver_file}"; then
+ # REQUIRED_FOR upgrade from 4.13.x or 4.14.x or 4.16.x
+ # mutlipath and sasl password configuration logic moved to
+ # vdsm-tool in 4.17.
"$VDSM_TOOL" configure --module multipath --module passwd
ret=$?
fi
--
To view, visit https://gerrit.ovirt.org/49510
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If307e37397adf99e8a2c3508c8f953507db3f37b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Yeela Kaplan <ykaplan at redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
More information about the vdsm-patches
mailing list