From: Nathan Cutler Date: Sun, 29 Jul 2018 18:43:23 +0000 (+0200) Subject: tools/ceph-detect-init: support RHEL as a platform X-Git-Tag: v13.2.2~120^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23303%2Fhead;p=ceph.git tools/ceph-detect-init: support RHEL as a platform 12d94cae2a06fd2ae39379e233588be99bff91de introduced a regression in that it started returning '' as the codename for most supported distros, and also (apparently) changed the distro string returned on Red Hat Enterprise Linux (to "rhel"). As a result, ceph-detect-init began throwing an UnsupportedPlatform exception on RHEL. Can not be cherry-picked because ceph-disk and ceph-detect-init are no longer present in master. Fixes: 12d94cae2a06fd2ae39379e233588be99bff91de Fixes: http://tracker.ceph.com/issues/18163 Signed-off-by: Nathan Cutler --- diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py index 9a0fcba1d5d2..68f6dd9212c6 100644 --- a/src/ceph-detect-init/ceph_detect_init/__init__.py +++ b/src/ceph-detect-init/ceph_detect_init/__init__.py @@ -88,7 +88,7 @@ def _get_distro(distro, use_rhceph=False): def _normalized_distro_name(distro): distro = distro.lower() - if distro.startswith(('redhat', 'red hat')): + if distro.startswith(('redhat', 'red hat', 'rhel')): return 'redhat' elif distro.startswith(('scientific', 'scientific linux')): return 'scientific'