From 8b11acbcf2a80b248bdb99cf4f329c0a02e3193c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 14 Dec 2020 09:47:56 -0500 Subject: [PATCH] Recognize CentOS Stream Allow installation of CentOS stream as a profile. --- confluent_server/confluent/osimage.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index bf0c31ef..e1ee90f9 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -231,6 +231,7 @@ def check_centos(isoinfo): ver = None arch = None cat = None + isstream = '' for entry in isoinfo[0]: if 'centos-release-7' in entry: dotsplit = entry.split('.') @@ -243,9 +244,15 @@ def check_centos(isoinfo): arch = entry.split('.')[-2] cat = 'el8' break + elif 'centos-stream-release-8' in entry: + ver = entry.split('-')[2] + arch = entry.split('.')[-2] + cat = 'el8' + isstream = '-stream' + break else: return None - return {'name': 'centos-{0}-{1}'.format(ver, arch), 'method': EXTRACT, 'category': cat} + return {'name': 'centos{2}-{0}-{1}'.format(ver, arch, isstream), 'method': EXTRACT, 'category': cat} def check_esxi(isoinfo): if '.DISCINFO' not in isoinfo[1]: