openstack
/
kolla
Code Issues Proposed changes

base: Rocky Linux 9.1 was released 

And they use release version in /etc/os-release so we need to adapt.

Telegraf also needs to be marked unbuildable because of [1].

[1]: https://github.com/influxdata/telegraf/issues/12303

Change-Id: I1d624bd2f87be93a386147c5d7403a5524e41633
This commit is contained in:
Marcin Juszkiewicz 2022-11-30 15:24:45 +01:00 committed by Maksim Malchuk
parent ef786de775
commit c6012bde6c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kolla/common/config.py
View File

@ -33,7 +33,7 @@ DEFAULT_BASE_TAGS = {
DISTRO_PRETTY_NAME = {
'centos': 'CentOS Stream 9',
'debian': 'Debian GNU/Linux 11 (bullseye)',
'rocky': 'Rocky Linux 9.0 (Blue Onyx)',
'rocky': 'Rocky Linux 9.1 (Blue Onyx)',
'ubuntu': 'Ubuntu 22.04',
}
OPENSTACK_RELEASE = 'master'

4
kolla/image/unbuildable.py
View File

@ -27,6 +27,8 @@ UNBUILDABLE_IMAGES = {
# Issues for SHA1 keys:
# https://github.com/elastic/elasticsearch/issues/85876
# https://github.com/grafana/grafana/issues/41036
# Issue with telegraf:
# https://github.com/influxdata/telegraf/issues/12303
'centos': {
"elasticsearch", # SHA1 gpg key
"hacluster-pcs", # Missing crmsh package
@ -35,6 +37,7 @@ UNBUILDABLE_IMAGES = {
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS
"tgtd", # Not supported on CentOS
"telegraf", # Package is not signed
},
'debian': {
@ -48,6 +51,7 @@ UNBUILDABLE_IMAGES = {
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS
"tgtd", # Not supported on CentOS
"telegraf", # Package is not signed
},
'ubuntu': {