Change in vdsm[master]: To avoid vdsm upgrade bugs all modules configure should run

ybronhei at redhat.com ybronhei at redhat.com
Thu Apr 2 13:11:27 UTC 2015


Yaniv Bronhaim has uploaded a new change for review.

Change subject: To avoid vdsm upgrade bugs all modules configure should run
......................................................................

To avoid vdsm upgrade bugs all modules configure should run

Currently we run only libvirt and multipath configure. The problem is
that we add those call to the new version and on upgrade the %postun
script of the updated version is ran. Adding the new multipath configure
won't help between 3.5 to 3.6 because it does not exist in 3.5. We need
to find another solution for specific modules configuration change
between 3.5 to 3.6 but with this patch from 3.6 and above we won't need
to worry about other modules - all configurators will run on upgrade.

If between 3.5 to 3.6 multipath.conf must update we need to do it in
vdsmd_init_script as deprecated code.

This patch also removes the calls to '/usr/lib/systemd/systemd-vdsmd'
'/etc/init.d/vdsmd' which related to 3.3 version and does not need to be
supported anymore.

Change-Id: If6ab88c2dc6321864d9d934355e618f70e95ca10
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/39492/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index ec0b377..1a29382 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -937,25 +937,9 @@
         supervdsmd_start_required='yes'
     fi
 
-    if ! %{_bindir}/vdsm-tool is-configured --module multipath >/dev/null 2>&1;
+    if ! %{_bindir}/vdsm-tool is-configured >/dev/null 2>&1;
     then
-        %{_bindir}/vdsm-tool configure --module multipath --force \
-            >/dev/null 2>&1;
-    fi
-
-    if ! %{_bindir}/vdsm-tool is-configured --module libvirt >/dev/null 2>&1;
-    then
-        if ! %{_bindir}/vdsm-tool configure --module libvirt --force \
-                >/dev/null 2>&1; then
-            # fallback to vdsmd reconfigure api - This change may be removed
-            # when vdsm won't support any downgrade\upgrade to versions that
-            # don't include vdsm-tool configure api (vdsm <= 3.3)
-            for f in '/usr/lib/systemd/systemd-vdsmd' '/etc/init.d/vdsmd'; do
-                if [ -f "${f}" ]; then
-                    "${f}" reconfigure >/dev/null 2>&1 || :
-                fi
-            done
-        fi
+        %{_bindir}/vdsm-tool configure --force >/dev/null 2>&1; then
     fi
 
     if [ "${supervdsmd_start_required}" = 'yes' ]; then


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6ab88c2dc6321864d9d934355e618f70e95ca10
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list