Treat RHEL as CentOS when scheduling

http://tracker.ceph.com/issues/11772

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

diff --git a/teuthology/suite.py b/teuthology/suite.py
index ad33ba88c4d0377fea7530dbee83542fd0212870..466edf5ad740157e7c0c6a13e73ebdd90a0394a2 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -380,12 +380,11 @@ def get_distro_defaults(distro, machine_type):
     ('armv7l', 'saucy', 'deb') when passed 'ubuntu' and 'saya'
     ('x86_64', 'wheezy', 'deb') when passed 'debian'
     ('x86_64', 'fedora20', 'rpm') when passed 'fedora'
-    ('x86_64', 'centos6', 'rpm') when passed 'centos'
-    And ('x86_64', 'rhel7_0', 'rpm') when passed anything else
+    And ('x86_64', 'centos7', 'rpm') when passed anything else
     """
     arch = 'x86_64'
-    if distro in (None, 'None', 'rhel'):
-        release = 'rhel7_0'
+    if distro in (None, 'None', 'rhel', 'centos'):
+        release = 'centos7'
         pkg_type = 'rpm'
     elif distro == 'ubuntu':
         pkg_type = 'deb'
@@ -397,9 +396,6 @@ def get_distro_defaults(distro, machine_type):
     elif distro == 'debian':
         release = 'wheezy'
         pkg_type = 'deb'
-    elif distro == 'centos':
-        release = 'centos6'
-        pkg_type = 'rpm'
     elif distro == 'fedora':
         release = 'fedora20'
         pkg_type = 'rpm'

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index b7e03edbf95ee0a225aab071928a4944b4673bd9..c12b249bb1bcd9620f1a9e56475f15dfba2dfb41 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -293,7 +293,7 @@ class TestDistroDefaults(object):
 
     def test_distro_defaults_centos(self):
         assert suite.get_distro_defaults('centos', 'magna') == ('x86_64',
-                                                                'centos6',
+                                                                'centos7',
                                                                 'rpm')
 
     def test_distro_defaults_fedora(self):
@@ -303,7 +303,7 @@ class TestDistroDefaults(object):
 
     def test_distro_defaults_default(self):
         assert suite.get_distro_defaults('rhel', 'magna') == ('x86_64',
-                                                              'rhel7_0',
+                                                              'centos7',
                                                               'rpm')