From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Fri, 12 Apr 2019 23:59:10 +0000 (+0000)
Subject: opsys: Drop opensuse-leap from DISTRO_CODENAME_MAP
X-Git-Tag: 1.1.0~250^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56ce88f65dced27abf2d5db6a2b5f69762bb121c;p=teuthology.git

opsys: Drop opensuse-leap from DISTRO_CODENAME_MAP

Drop 'opensuse-leap' from DISTRO_CODENAME_MAP in favor of 'opensuse'

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index e384d0830..20795dcc0 100644
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -49,13 +49,6 @@ DISTRO_CODENAME_MAP = {
         "12.2": "sle",
         "12.3": "sle",
     },
-    "opensuse-leap": {
-        "42.1": "leap",
-        "42.2": "leap",
-        "42.3": "leap",
-        "15.0": "leap",
-        "15.1": "leap",
-    },
 }
 
 DEFAULT_OS_VERSION = dict(
@@ -80,7 +73,7 @@ class OS(object):
     __slots__ = ['name', 'version', 'codename', 'package_type']
 
     _deb_distros = ('debian', 'ubuntu')
-    _rpm_distros = ('fedora', 'rhel', 'centos', 'opensuse', 'opensuse-leap', 'sle')
+    _rpm_distros = ('fedora', 'rhel', 'centos', 'opensuse', 'sle')
 
     def __init__(self, name=None, version=None, codename=None):
         self.name = name