Piotr Kliczewski has uploaded a new change for review.

Change subject: init: run configure --force on upgrade from ovirt-3.5
......................................................................

init: run configure --force on upgrade from ovirt-3.5

In case we upgrade from ovirt-3.5 we now run configure --force to make
sure that vdsm is configured properly.


Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1276736
Change-Id: I9044d10dc5252f2407eccbbf82cd7589638b44ea
Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com>
---
M init/vdsmd_init_common.sh.in
1 file changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/48194/1

diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index 503b88e..1f24ff1 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -254,13 +254,9 @@
     local upgraded_ver_file="@VDSMLIBDIR@/upgraded_version"
     if [ -f "${upgraded_ver_file}" ]; then
         local ret=0
-        if grep -q '^vdsm-4\.10\.' "${upgraded_ver_file}"; then
-             # REQUIRED_FOR upgrade from vdsm-4.10.x
+        if grep -q -E '^vdsm-4\.10\.|^vdsm-4\.16\.' "${upgraded_ver_file}"; 
then
+             # REQUIRED_FOR upgrade from vdsm-4.10.x or vdsm-4.16.z
              "$VDSM_TOOL" configure --force
-             ret=$?
-        elif grep -q '^vdsm-4\.16\.' "${upgraded_ver_file}"; then
-             # REQUIRED_FOR upgrade from vdsm-4.16.z
-             "$VDSM_TOOL" configure --module multipath
              ret=$?
         fi
         [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}"


-- 
To view, visit https://gerrit.ovirt.org/48194
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9044d10dc5252f2407eccbbf82cd7589638b44ea
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to