From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 3 Dec 2014 03:07:01 +0000 (-0800)
Subject: misc.get_system_type(): fix distro=False version=True, add comments
X-Git-Tag: 1.1.0~1061^2~15^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef12e5f9a5799d5de07c2fccb030fc7e5c703e2c;p=teuthology.git

misc.get_system_type(): fix distro=False version=True, add comments

Fixes: #10237
Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index ae849da8..52d850e1 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -1093,7 +1093,11 @@ def stop_daemons_of_type(ctx, type_):
 
 def get_system_type(remote, distro=False, version=False):
     """
-    Return this system type (deb or rpm) or Distro.
+    If distro, return distro.
+    If version, return version (lsb_release -rs)
+    If both, return both.
+    If neither, return 'deb' or 'rpm' if distro is known to be one of those
+    Finally, if unknown, return the unfiltered distro (from lsb_release -is)
     """
     r = remote.run(
         args=[
@@ -1110,13 +1114,13 @@ def get_system_type(remote, distro=False, version=False):
         return system_value.lower(), version
     if distro:
         return system_value.lower()
+    if version:
+        return version
     if system_value in ['Ubuntu', 'Debian']:
         return "deb"
     if system_value in ['CentOS', 'Fedora', 'RedHatEnterpriseServer',
                         'openSUSE project', 'SUSE LINUX']:
         return "rpm"
-    if version:
-        return version
     return system_value