Skip to content

Commit

Permalink
tools/ceph-detect-init: support RHEL as a platform
Browse files Browse the repository at this point in the history
12d94ca 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: 12d94ca
Fixes: http://tracker.ceph.com/issues/18163
Signed-off-by: Nathan Cutler <ncutler@suse.com>
  • Loading branch information
smithfarm committed Jul 31, 2018
1 parent 5178d0a commit 81b7cd9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ceph-detect-init/ceph_detect_init/__init__.py
Expand Up @@ -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'
Expand Down

0 comments on commit 81b7cd9

Please sign in to comment.