From: Zack Cerza <zack@redhat.com>
Date: Fri, 20 May 2016 21:42:18 +0000 (-0600)
Subject: Move constants to opsys module
X-Git-Tag: 1.1.0~603^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc503de980db7084e1079659ea3e0ef468017ba6;p=teuthology.git

Move constants to opsys module

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index 34cee5f3d..4831e20a8 100644
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -1,6 +1,29 @@
 import ast
 import re
 
+DISTRO_CODENAME_MAP = {
+    "ubuntu": {
+        "16.04": "xenial",
+        "14.04": "trusty",
+        "12.04": "precise",
+        "15.04": "vivid",
+    },
+    "debian": {
+        "7": "wheezy",
+        "8": "jessie",
+    },
+}
+
+DEFAULT_OS_VERSION = dict(
+    ubuntu="14.04",
+    fedora="20",
+    centos="7.0",
+    opensuse="12.2",
+    sles="11-sp2",
+    rhel="7.0",
+    debian='7.0'
+)
+
 
 class OS(object):
     """
diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index a4cafbb94..0ca8e3205 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -8,6 +8,7 @@ from cStringIO import StringIO
 from .config import config
 from .contextutil import safe_while
 from .exceptions import VersionNotFoundError
+from .orchestra.opysys import DISTRO_CODENAME_MAP, DEFAULT_OS_VERSION
 
 log = logging.getLogger(__name__)
 
@@ -28,29 +29,6 @@ _SERVICE_MAP = {
     'httpd': {'deb': 'apache2', 'rpm': 'httpd'}
 }
 
-DISTRO_CODENAME_MAP = {
-    "ubuntu": {
-        "16.04": "xenial",
-        "14.04": "trusty",
-        "12.04": "precise",
-        "15.04": "vivid",
-    },
-    "debian": {
-        "7": "wheezy",
-        "8": "jessie",
-    },
-}
-
-DEFAULT_OS_VERSION = dict(
-    ubuntu="14.04",
-    fedora="20",
-    centos="7.0",
-    opensuse="12.2",
-    sles="11-sp2",
-    rhel="7.0",
-    debian='7.0'
-)
-
 
 def get_package_name(pkg, rem):
     """