From b1a0e712b394496544bbb62f9466a8aa75f4c669 Mon Sep 17 00:00:00 2001
From: Dan Kenigsberg <danken@redhat.com>
Date: Tue, 26 Jun 2012 15:43:33 +0300
Subject: [PATCH 26/26] BZ#806555 having /etc/ovirt-node-* means it is a node
Not vice versa.
This patch fixes http://gerrit.ovirt.org/3055 .
Change-Id: Id13c5621a2ff1c8bdcfc1e40a27951efb0d75cfe
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/5713
Reviewed-by: Michael Burns <mburns@redhat.com>
Reviewed-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Tested-by: Ofer Schreiber <oschreib@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/5768
Reviewed-by: Federico Simoncelli <fsimonce@redhat.com>
Tested-by: Federico Simoncelli <fsimonce@redhat.com>
---
vdsm/caps.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 5950ee9..5c9fa78 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -156,7 +156,7 @@ def _getIscsiIniName():
def getos():
if os.path.exists('/etc/rhev-hypervisor-release'):
return OSName.RHEVH
- elif len(glob.glob('/etc/ovirt-node-*-release')) == 0:
+ elif glob.glob('/etc/ovirt-node-*-release'):
return OSName.OVIRT
elif os.path.exists('/etc/fedora-release'):
return OSName.FEDORA
--
1.7.10.2