Blob Blame History Raw
From 95be2057db1bea2730bc4b65058f5b1a42ab45bd Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Date: Mon, 17 Dec 2012 19:23:21 -0500
Subject: [PATCH 4/6] caps.py: osversion() validate OVIRT

Currently we are only validating RHEV-H node.
This patch will validate oVirt node as well in osversion().

Change-Id: I58efd4660f94b2f68ead470a54f0f301a1b9b4ba
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=873917
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/10177
Reviewed-by: Alon Bar-Lev <alonbl@redhat.com>
Tested-by: Alon Bar-Lev <alonbl@redhat.com>
Reviewed-by: Dan Kenigsberg <danken@redhat.com>
---
 vdsm/caps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdsm/caps.py b/vdsm/caps.py
index 6749227..e9a1476 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -229,7 +229,7 @@ def osversion():
 
     osname = getos()
     try:
-        if osname == OSName.RHEVH:
+        if osname == OSName.RHEVH or osname == OSName.OVIRT:
             d = _parseKeyVal(file('/etc/default/version'))
             version = d.get('VERSION', '')
             release = d.get('RELEASE', '')
-- 
1.7.11.7