From Yaniv Bronhaim <ybron...@redhat.com>:

Yaniv Bronhaim has uploaded a new change for review.

Change subject: remove upgrade hacks for older versions
......................................................................

remove upgrade hacks for older versions

Change-Id: I7ec84b22905200f6189891785e4367889ce28bde
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M init/vdsmd_init_common.sh.in
M vdsm.spec.in
2 files changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/77780/1

diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index cbec4a6..4e50ecb 100755
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -195,24 +195,6 @@
 }
 
 
-task_upgraded_version_check(){
-    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
-             "$VDSM_TOOL" configure --force
-             ret=$?
-        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
-        [ "${ret}" -eq 0 ] && rm -f "${upgraded_ver_file}"
-    fi
-}
 #### pre-start tasks end ####
 
 
@@ -250,7 +232,6 @@
             configure_vdsm_logs \
             wait_for_network \
             run_init_hooks \
-            upgraded_version_check \
             check_is_configured \
             validate_configuration \
             prepare_transient_repository \
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 6936958..1798d33 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -772,7 +772,6 @@
 /usr/sbin/usermod -a -G %{cdrom_group} %{qemu_user}
 
 # We keep the previous rpm version number in a file for managing upgrade flow
-# in vdsmd_init_script upgraded_version_check task
 if [ "$1" -gt 1 ]; then
     rpm -q %{vdsm_name} > "%{_localstatedir}/lib/%{vdsm_name}/upgraded_version"
 fi


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ec84b22905200f6189891785e4367889ce28bde
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Reply via email to