packaging: use OS's new codename discovery

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

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 0ca8e3205b7d54e777f1644eefc7b0003d7fb2c4..eec7b456bb2f49ddb81867b945ac1b9b768af354 100644 (file)
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -8,7 +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
+from .orchestra.opsys import OS, DEFAULT_OS_VERSION
 
 log = logging.getLogger(__name__)
 
@@ -609,15 +609,10 @@ class GitbuilderProject(object):
 
         :returns: The codename as string or None if not found.
         """
-        major_version = version.split(".")[0]
-        distro_codes = DISTRO_CODENAME_MAP.get(distro)
-        if not distro_codes:
-            return None
-        codename = distro_codes.get(version)
-        if not codename:
-            codename = distro_codes.get(major_version)
-
-        return codename
+        try:
+            return OS._version_to_codename(distro, version)
+        except RuntimeError:
+            pass
 
     def _get_version(self):
         """