]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #268 from ceph/wip-5400
authorZack Cerza <zack@cerza.org>
Mon, 9 Jun 2014 21:41:10 +0000 (16:41 -0500)
committerZack Cerza <zack@cerza.org>
Mon, 9 Jun 2014 21:41:10 +0000 (16:41 -0500)
Support installing ceph kernels from gitbuilder on rpm machines.

1  2 
teuthology/misc.py
teuthology/task/kernel.py

index 45fbc8afb45471cd6e74f9cdbd81bf832df4ea5c,0ef57bc0f006d2db0043722c49a8212004b5b1c8..1725bc25c28e46f606b51b672f04d5a476dea533
@@@ -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
  
  
Simple merge