diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-11-30 15:24:45 +0100 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2022-11-30 17:59:53 +0000 |
| commit | c6012bde6ca0e50927699b47fbdb737845ee49ed (patch) | |
| tree | c82c69831e396cf89c65435d333a09c0f44f498b | |
| parent | ef786de775dda0cad195fd75405e82e782f01451 (diff) | |
| download | kolla-c6012bde6ca0e50927699b47fbdb737845ee49ed.tar.gz kolla-c6012bde6ca0e50927699b47fbdb737845ee49ed.zip | |
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
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 21c45a921..88c56e634 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -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' diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index aabdfbfe4..4f9e18dd4 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -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': { |