backend/server/handlers/xmlrpc/registration.py | 2 ++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0936ecebeace4a7269593caf00fd5d2408497903
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Feb 20 17:03:48 2014 -0500
Automatic commit of package [spacewalk-backend] release [2.1.52-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index f746f1d..0515015 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.51
+Version: 2.1.52
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -632,6 +632,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Thu Feb 20 2014 Stephen Herr <sherr(a)redhat.com> 2.1.52-1
+- 1045083 - Detect OpenStack guests as virtual so they can consume flex guest
+
* Tue Feb 18 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.51-1
- 1064296 - rename variable so it doesn't colide with reserved word
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 8ffd429..4f48f5e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.51-1 backend/
+2.1.52-1 backend/
commit 9a825833d99328a6d3fde4c4bd06774b39926829
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Feb 20 17:03:32 2014 -0500
1045083 - Detect OpenStack guests as virtual so they can consume flex guest
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index 438e489..e8da7f7 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -68,6 +68,8 @@ def parse_smbios(smbios):
return (rhnVirtualization.VirtualizationType.QEMU, uuid)
elif manufacturer.startswith('Red Hat') and product == 'OpenStack
Nova' and uuid is not None:
return (rhnVirtualization.VirtualizationType.QEMU, uuid)
+ elif vendor == 'Red Hat' and product == 'OpenStack Compute':
+ return (rhnVirtualization.VirtualizationType.QEMU, uuid)
elif manufacturer == 'Microsoft Corporation' and \
product == 'Virtual Machine':
if uuid is None: