From 86c0d79d731cd42b9991216403032bcc708d28c2 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 6 Aug 2020 20:40:31 -0400 Subject: [PATCH] Fix RHEL 7 support It was not correctly fingerprinting RHEL 7. --- confluent_server/confluent/osimage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index 31971c3f..685256ea 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -333,6 +333,14 @@ def check_rhel(isoinfo): arch = dotsplit[-2] ver = dotsplit[0].split('release-')[-1].replace('-', '.') break + elif 'redhat-release-server-7' in entry: + dotsplit = entry.split('.') + arch = dotsplit[-2] + ver = dotsplit[0].split('release-server-')[-1].replace('-', '.') + if '.' not in ver: + minor = dotsplit[1].split('-', 1)[0] + ver = ver + '.' + minor + break elif 'redhat-release-8' in entry: ver = entry.split('-')[2] arch = entry.split('.')[-2]