x
/
packstack
Code Issues Proposed changes

Support CS9 when installing RDO repo 

Change-Id: I5618353cb368e9d56188297dfdf87b1b127ee653
This commit is contained in:
Joel Capitao 2022-04-08 14:43:37 +02:00
parent f863661516
commit ecb6e851a8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packstack/plugins/prescript_000.py
View File

@ -1123,6 +1123,8 @@ def manage_rdo(host, config):
version = match.group('version')
if re.match(r'^(.*\.el8.*\n)', out):
dist_tag = '.el8'
elif re.match(r'^(.*\.el9s.*\n)', out):
dist_tag = '.el9s'
else:
dist_tag = ''
rdo_url = ("https://www.rdoproject.org/repos/openstack-%(version)s/"
@ -1152,7 +1154,10 @@ def manage_rdo(host, config):
# if succeeds
# In CentOS 8 yum-config-manager returns 1 when failing but doesn't return current
# setup if succeeds
if (dist_tag == '.el8' and rc != 0) or (dist_tag == '' and not match):
# In CentOS 9 yum-config-manager returns 1 when failing but doesn't return current
# setup if succeeds
if ((dist_tag == '.el9s' and rc != 0) or (dist_tag == '.el8' and rc != 0) or
(dist_tag == '' and not match)):
msg = ('Failed to set RDO repo on host %s:\nRPM file seems to be '
'installed, but appropriate repo file is probably missing '
'in /etc/yum.repos.d/' % host)