Change in vdsm[master]: packaging: Branding and spec file changes for downstream

dkuznets at redhat.com dkuznets at redhat.com
Sun Nov 30 15:21:51 UTC 2014


Hello Douglas Schilling Landgraf, Eyal Edri, Yaniv Bronhaim, Federico Simoncelli,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/35722

to review the following change.

Change subject: packaging: Branding and spec file changes for downstream
......................................................................

packaging: Branding and spec file changes for downstream

* On RHEV we should use the specific qemu-*-rhev packages.
  Updated qemu-*-rhev minimal version to match rhel 65 version.

* dumpStorageTable.py was moved[1][2] from vdsm-cli to vdsm package.

  As result when updating vdsm without vdsm-cli there is a conflict
  between the old vdsm-cli and the new vdsm packages.

  Our old bootstrap code which is shipped with rhevm-3.0 installs
  packages one by one, failing any bootstrap if such conflict exists.

  The temporary simplest solution is to pull vdsm-cli into dependency try
  of vdsm package, this dependency will be removed in future when
  newer vdsm-bootstrap be distributed to all rhevm machines.

[1] Ic9dfdc2
[2] http://gerrit.ovirt.org/1889

* Disabling creation of gluster packages during vdsm make process
  As described in bz1031707, vdsm 3.3.0 should not provide vdsm-gluster
  rpm

* Added correct --with-* flags to configuration when building rhev.

Label: DOWNSTREAM ONLY
Change-Id: I30b554e5614bdda2b02538538b5e6514ae94eaf5
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=870079
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=909870
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1011610
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1119020
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
Signed-off-by: Eyal Edri <eedri at redhat.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
Signed-off-by: Dima Kuznetsov <dkuznets at redhat.com>
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M configure.ac
M vdsm.spec.in
2 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/35722/1

diff --git a/configure.ac b/configure.ac
index a04161d..f40d816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,18 @@
     ,
     [enable_hooks="no"]
 )
+
+# Build for RHEV
+AC_ARG_ENABLE(
+    [rhev],
+    [AS_HELP_STRING(
+        [--enable-rhev],
+        [Build for RHEV]
+    )],
+    [enable_rhev="yes"]
+    ,
+)
+
 AM_CONDITIONAL([HOOKS], [test "${enable_hooks}" = "yes"])
 AM_CONDITIONAL([RHEV], [test "${enable_rhev}" = "yes"])
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 86a43c7..b6e4e2a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -32,11 +32,15 @@
 %global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
 %endif
 
+# Gluster should not be shipped with RHEV
+%if ! 0%{?rhev_build}
 %global with_gluster 1
+%endif
 
-%if ! 0%{?rhel}
+%if ! 0%{?rhel} || ! 0%{?rhev_build}
 %global with_vhostmd 1
 %endif
+
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_systemd 1
@@ -171,6 +175,9 @@
 Requires: libvirt >= 0.10.2-29.el6_5.4
 %else
 Requires: libvirt >= 1.1.1
+%if 0%{?rhev_build}
+Requires: libvirt >= 0.10.2-18.el6_4.4
+%endif
 %endif
 %endif
 Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
@@ -179,6 +186,9 @@
 %if 0%{?rhel}
 %if 0%{?rhel} >= 7
 Requires: iscsi-initiator-utils
+%if 0%{?rhev_build}
+Requires: iscsi-initiator-utils >= 6.2.0.873-3
+%endif
 %else
 Requires: iscsi-initiator-utils >= 6.2.0.872-15
 %endif # rhel 7
@@ -275,6 +285,14 @@
 
 Requires(post): policycoreutils-python
 Requires(preun): policycoreutils-python
+
+%if 0%{?rhev_build}
+# backward compatible with older bootstrap code
+# see bug#870079
+# can be removed when rhevm-3.0 hosts are
+# updated with latest vdsm-bootstrap
+Requires: %{name}-cli = %{version}-%{release}
+%endif
 
 %description
 The VDSM service is required by a Virtualization Manager to manage the
@@ -686,6 +704,7 @@
 %endif
 %configure %{?with_hooks:--enable-hooks} \
         %{?with_chown_hack:--enable-chown-hack} \
+        %{?rhev_build:--enable-rhev}
 
 make
 # Setting software_version and software_revision in dsaversion.py


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30b554e5614bdda2b02538538b5e6514ae94eaf5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov <dkuznets at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list