From 1400c24414ed121dddbdcec9d348582651439a5e Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 26 May 2015 14:11:06 -0600 Subject: [PATCH] Treat RHEL as CentOS in task.install http://tracker.ceph.com/issues/11772 Signed-off-by: Zack Cerza --- teuthology/task/install.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 3e7779191b..723de7d026 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -150,7 +150,7 @@ def _get_baseurlinfo_and_dist(ctx, remote, config): 'lsb_release', '-rs'], stdout=StringIO()) retval['relval'] = r.stdout.getvalue().strip() dist_name = None - if retval['distro'] == 'CentOS': + if retval['distro'] in ('CentOS', 'RedHatEnterpriseServer'): relval = retval['relval'] relval = relval[0:relval.find('.')] distri = 'centos' @@ -158,14 +158,6 @@ def _get_baseurlinfo_and_dist(ctx, remote, config): retval['dist'] = retval['distro_release'] dist_name = 'el' retval['dist_release'] = '%s%s' % (dist_name, relval) - elif retval['distro'] == 'RedHatEnterpriseServer': - relval = retval['relval'].replace('.', '_') - distri = 'rhel' - retval['distro_release'] = '%s%s' % (distri, relval) - retval['dist'] = retval['distro_release'] - dist_name = 'el' - short_relval = relval[0:relval.find('_')] - retval['dist_release'] = '%s%s' % (dist_name, short_relval) elif retval['distro'] == 'Fedora': distri = retval['distro'] dist_name = 'fc' -- 2.39.5