From: Zack Cerza <zack@cerza.org>
Date: Mon, 9 Jun 2014 21:41:10 +0000 (-0500)
Subject: Merge pull request #268 from ceph/wip-5400
X-Git-Tag: 1.1.0~1409
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a405c228fc4a3a4d8676801e589171eea194ceb2;p=teuthology.git

Merge pull request #268 from ceph/wip-5400

Support installing ceph kernels from gitbuilder on rpm machines.
---

a405c228fc4a3a4d8676801e589171eea194ceb2
diff --cc teuthology/misc.py
index 45fbc8afb4,0ef57bc0f0..1725bc25c2
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@@ -1116,9 -1121,10 +1121,11 @@@ def get_system_type(remote, distro=Fals
          return system_value.lower()
      if system_value in ['Ubuntu', 'Debian']:
          return "deb"
 -    if system_value in ['CentOS', 'Fedora', 'RedHatEnterpriseServer']:
 +    if system_value in ['CentOS', 'Fedora', 'RedHatEnterpriseServer',
 +                        'openSUSE project', 'SUSE LINUX']:
          return "rpm"
+     if version:
+         return version
      return system_value