Change in vdsm[master]: vdsm: export mininum kernel via caps

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm: export mininum kernel via caps
......................................................................

vdsm: export mininum kernel via caps

Export to engine the minimum kernel required for vdsm.

Change-Id: I16c496e1a77639c39fae733e3a34c974b6f10b5c
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=966158
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
---
M .gitignore
M configure.ac
M vdsm.spec.in
M vdsm/Makefile.am
R vdsm/caps.py.in
5 files changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 295e1fb..290bf67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 vdsm.spec
 vdsm/dsaversion.py
 vdsm/dumpStorageTable.py
+vdsm/caps.py
 vdsm/logger.conf
 vdsm/mk_sysprep_floppy
 vdsm/mom.conf
diff --git a/configure.ac b/configure.ac
index 93b6b96..694242d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,10 @@
 AC_SUBST([SNLKUSER], [sanlock])
 AC_SUBST([SNLKGROUP], [sanlock])
 
+# Minimum Kernel
+AC_SUBST([KERNEL_MINIMUM_VERSION_EL6], [2.6.32-279.9.1])
+AC_SUBST([KERNEL_MINIMUM_UPSTREAM], [3.6])
+
 # VDSM default paths
 AC_SUBST([vdsmdir], ['${datarootdir}/vdsm'])
 AC_SUBST([vdsmconfdir], ['${sysconfdir}/vdsm'])
diff --git a/vdsm.spec.in b/vdsm.spec.in
index e175ff8..942d417 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -150,7 +150,7 @@
 Requires: device-mapper-multipath >= 0.4.9-52
 Requires: e2fsprogs >= 1.41.12-11
 Requires: fence-agents
-Requires: kernel >= 2.6.32-279.9.1
+Requires: kernel >= @KERNEL_MINIMUM_VERSION_EL6@
 Requires: sanlock >= 2.3-4, sanlock-python
 Requires: initscripts >= 9.03.31-2.el6_3.1
 Requires: policycoreutils >= 2.0.83-19.30
@@ -179,7 +179,7 @@
 Requires: iscsi-initiator-utils >= 6.2.0.872-14
 Requires: device-mapper-multipath >= 0.4.9-18
 Requires: e2fsprogs >= 1.41.14
-Requires: kernel >= 3.6
+Requires: kernel >= @KERNEL_MINIMUM_UPSTREAM@
 Requires: sanlock >= 2.4-2, sanlock-python
 Requires: policycoreutils-python
 Requires: sed >= 4.2.1-10
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 305ef6b..f135f73 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -27,7 +27,6 @@
 	API.py \
 	BindingXMLRPC.py \
 	blkid.py \
-	caps.py \
 	clientIF.py \
 	configNetwork.py \
 	debugPluginClient.py \
@@ -64,6 +63,7 @@
 	$(NULL)
 
 nodist_vdsm_PYTHON = \
+	caps.py \
 	dsaversion.py \
 	dumpStorageTable.py
 
@@ -94,6 +94,7 @@
 	vdsmd.8
 
 CLEANFILES = \
+	caps.py \
 	config.log \
 	$(nodist_vdsm_SCRIPTS) \
 	$(nodist_vdsmlib_PYTHON) \
@@ -103,6 +104,7 @@
 	$(nodist_man8_MANS)
 
 EXTRA_DIST = \
+	caps.py.in \
 	dsaversion.py.in \
 	dumpStorageTable.py.in \
 	libvirt_password \
diff --git a/vdsm/caps.py b/vdsm/caps.py.in
similarity index 96%
rename from vdsm/caps.py
rename to vdsm/caps.py.in
index 3a7a6a2..fd6d528 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py.in
@@ -318,7 +318,16 @@
         except:
             logging.error('kernel build time not found', exc_info=True)
             t = '0'
-        return dict(version=ver, release=rel, buildtime=t)
+
+        # kernel minimum version
+        osname = getos()
+        if osname == OSName.RHEL:
+            kernel_min_version = '@KERNEL_MINIMUM_VERSION_EL6@'
+        else:
+            kernel_min_version = '@KERNEL_MINIMUM_UPSTREAM@'
+
+        return dict(version=ver, release=rel, buildtime=t,
+                    kernel_minimum_version=kernel_min_version)
 
     pkgs = {'kernel': kernelDict()}
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16c496e1a77639c39fae733e3a34c974b6f10b5c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;