aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/glance/glance-api/Dockerfile.j22
-rw-r--r--docker/horizon/Dockerfile.j23
-rw-r--r--kolla/common/sources.py48
-rw-r--r--kolla/template/repos.yaml2
-rw-r--r--releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml5
-rw-r--r--releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml7
-rw-r--r--releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml5
-rw-r--r--releasenotes/notes/update-prometheus-services-98085e2ccf13d1fb.yaml16
8 files changed, 62 insertions, 26 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 992fc0996..045efb6ae 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set glance_api_packages = [
'lsscsi',
'device-mapper-multipath',
+ 'nvme-cli',
'qemu-img'
] %}
{% elif base_package_type == 'deb' %}
@@ -18,6 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'lsscsi',
'multipath-tools',
'nfs-common',
+ 'nvme-cli',
'qemu-utils'
] %}
{% endif %}
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index b854ca0f6..c7d6f8aa2 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -36,7 +36,8 @@ ADD horizon-archive /horizon-source
ADD plugins-archive /
{% set horizon_pip_packages = [
- '/horizon'
+ '/horizon',
+ 'django_redis'
] %}
{% set horizon_plugins_pip_packages = [
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 0ef76cfe7..fa9b12126 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -271,66 +271,66 @@ SOURCES = {
'location': ('$tarballs_base/openstack/placement/'
'placement-${openstack_branch}.tar.gz')},
'prometheus-alertmanager': {
- 'version': '0.28.1',
+ 'version': '0.31.1',
'type': 'url',
'sha256': {
- 'amd64': '5ac7ab5e4b8ee5ce4d8fb0988f9cb275efcc3f181b4b408179fafee121693311', # noqa: E501
- 'arm64': 'd8832540e5b9f613d2fd759e31d603173b9c61cc7bb5e3bc7ae2f12038b1ce4f'}, # noqa: E501
+ 'amd64': '35191cbd9d4f8162458b78dd7e93990cccd246044d9a6f788adb1c66ac3ea07b', # noqa: E501
+ 'arm64': '266dda88b64318c27847ef9af4ff450fc178c827550a8039420c5ca8657a4a8b'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/alertmanager/'
'releases/download/v${version}/'
'alertmanager'
'-${version}.linux-${debian_arch}.tar.gz')},
'prometheus-blackbox-exporter': {
- 'version': '0.27.0',
+ 'version': '0.28.0',
'type': 'url',
'sha256': {
- 'amd64': '507a77ff411822fd6b543e8b8d9e00e1cc49408df465588cd746753bf05046e2', # noqa: E501
- 'arm64': '618f0ce44ecec617d5aab28f7e4cb930b41b45fcd3d899536d2b9653fc176e5a'}, # noqa: E501
+ 'amd64': 'caf5d242fb1cf6d5cb678f3f799f22703d4fafea26b03dcbbd7e1f1825e06329', # noqa: E501
+ 'arm64': '63312be0983d85e5109710a7dc93df3051157ae581853fa3655d171cc1b2806e'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/blackbox_exporter/'
'releases/download/v${version}/'
'blackbox_exporter'
'-${version}.linux-${debian_arch}.tar.gz')},
'prometheus-cadvisor': {
- 'version': '0.53.0',
+ 'version': '0.56.2',
'type': 'url',
'sha256': {
- 'amd64': '999c2c77b3ae80ea00b63a876a1ed92cc68e0a307fb3c51057107101e417bd0a', # noqa: E501
- 'arm64': '8c898e2d9a9d8e3b3b8b22a1a29b4489b2a7c962d0b8bca204c4f777d3961feb'}, # noqa: E501
+ 'amd64': 'ad92930f16a2f9da15190675e09eeaceb8fd38637d07a686bb0dd68695f692af', # noqa: E501
+ 'arm64': 'b7a707379496fd7a7b5d2768c5c494427112f534ba5069f889af28ffe6ad11bb'}, # noqa: E501
'location': ('https://github.com/'
'google/cadvisor/'
'releases/download/v${version}/'
'cadvisor'
'-v${version}-linux-${debian_arch}')},
'prometheus-elasticsearch-exporter': {
- 'version': '1.9.0',
+ 'version': '1.10.0',
'type': 'url',
'sha256': {
- 'amd64': '472fcafab63c5a3a2dd17d9a5e9919de4741a72e4f286c1e6252f3d99cebe425', # noqa: E501
- 'arm64': 'd1ba36fe0a6b7ce84d995e728044b53cc869f6033ce0ead4601232205d850947'}, # noqa: E501
+ 'amd64': '1dcf288082a25b2741e98da6c9fc012b6c821696a26c6ac57c20042f24714a74', # noqa: E501
+ 'arm64': '0ff4753a975eb5611c03123d565e8aaa84e4c05f698ce0a2d6c0f437a14bfe34'}, # noqa: E501
'location': ('https://github.com/'
'prometheus-community/elasticsearch_exporter/'
'releases/download/v${version}/'
'elasticsearch_exporter'
'-${version}.linux-${debian_arch}.tar.gz')},
'prometheus-libvirt-exporter': {
- 'version': '2.2.0',
+ 'version': '2.3.1',
'type': 'url',
'sha256': {
- 'amd64': '37e26779be1ebaef2e76d7304a3d3ecfbdc232a5c57645ee0f97b13f014bd842', # noqa: E501
- 'arm64': '94ac011349d60d70c14985df2942d02ecac87c0b7c7a468133394eb1800a22b0'}, # noqa: E501
+ 'amd64': '2e1657d10291059f420a467cbe3363c7353bbce9d5445f0d8d302bd96caaf0a8', # noqa: E501
+ 'arm64': '676dc76766ce4a2eaa8324a3aca8cfe89711536337d3b5b862ddf141fb57a224'}, # noqa: E501
'location': ('https://github.com/'
'inovex/prometheus-libvirt-exporter/'
'releases/download/v${version}/'
'prometheus-libvirt-exporter'
'-${version}.linux-${debian_arch}.tar.gz')},
'prometheus-memcached-exporter': {
- 'version': '0.15.3',
+ 'version': '0.15.5',
'type': 'url',
'sha256': {
- 'amd64': '7e4eb9f4af3971918fbfd35fa31b74dc08b2a728f488f934d8c7c7ecced2c85f', # noqa: E501
- 'arm64': '8565c24a80e30e189479b1092d23a7cc9173fc3f3591881b34ed99c62c3ead6f'}, # noqa: E501
+ 'amd64': '5b82e6579b77fae00683d10d5923329173925a5abd95a799f5489a66136b884c', # noqa: E501
+ 'arm64': '609e6d7484f22fd9e405c0022a9e2d7f86eedef1cfa55772231528271082aeae'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/memcached_exporter/'
'releases/download/v${version}/'
@@ -348,22 +348,22 @@ SOURCES = {
'mtail'
'_${version}_linux_${debian_arch}.tar.gz')},
'prometheus-mysqld-exporter': {
- 'version': '0.17.2',
+ 'version': '0.18.0',
'type': 'url',
'sha256': {
- 'amd64': 'ef6a2322b869d7d3c1ee3493e28a939ff80b367373142b9b2f3f70a6709d00d7', # noqa: E501
- 'arm64': '7d7ba18830ca374812a75cca1519b7c2fdea6d14183787bcd1b36900cdf588ee'}, # noqa: E501
+ 'amd64': '46e8f45654352bdd42d162b2b4a68f00055d45acc168f9c068235b9e3acc39c1', # noqa: E501
+ 'arm64': 'abdb452600ca086b68244aadf8045fbf0b6a48dcb76eed5576995806c176f6ce'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/mysqld_exporter/'
'releases/download/v${version}/'
'mysqld_exporter'
'-${version}.linux-${debian_arch}.tar.gz')},
'prometheus-node-exporter': {
- 'version': '1.9.1',
+ 'version': '1.10.2',
'type': 'url',
'sha256': {
- 'amd64': 'becb950ee80daa8ae7331d77966d94a611af79ad0d3307380907e0ec08f5b4e8', # noqa: E501
- 'arm64': '848f139986f63232ced83babe3cad1679efdbb26c694737edc1f4fbd27b96203'}, # noqa: E501
+ 'amd64': 'c46e5b6f53948477ff3a19d97c58307394a29fe64a01905646f026ddc32cb65b', # noqa: E501
+ 'arm64': 'de69ec8341c8068b7c8e4cfe3eb85065d24d984a3b33007f575d307d13eb89a6'}, # noqa: E501
'location': ('https://github.com/'
'prometheus/node_exporter/'
'releases/download/v${version}/'
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index ece8c49fb..2a40375e0 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -175,7 +175,7 @@ rpm:
distro: True
name: "opstools"
proxysql:
- baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9"
+ baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/10"
gpgkey: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key"
name: "proxysql"
rabbitmq:
diff --git a/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml b/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml
new file mode 100644
index 000000000..2c4186576
--- /dev/null
+++ b/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fix missing nvme-cli package in Glance container.
+ `LP#2035975 <https://launchpad.net/bugs/2035975>`__
diff --git a/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml b/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml
new file mode 100644
index 000000000..0cf23f330
--- /dev/null
+++ b/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Adds the ``django-redis`` package to the Horizon image.
+ This enables using Redis or Valkey as a Django cache and
+ session backend.
+ `LP#2093414 <https://launchpad.net/bugs/2093414>`__
diff --git a/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml b/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml
new file mode 100644
index 000000000..bb2a0f526
--- /dev/null
+++ b/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Bumped ProxySQL 3.0.x repository to Almalinux 10 for Redhat family
+ distributions.
diff --git a/releasenotes/notes/update-prometheus-services-98085e2ccf13d1fb.yaml b/releasenotes/notes/update-prometheus-services-98085e2ccf13d1fb.yaml
new file mode 100644
index 000000000..f894ffef7
--- /dev/null
+++ b/releasenotes/notes/update-prometheus-services-98085e2ccf13d1fb.yaml
@@ -0,0 +1,16 @@
+---
+upgrade:
+ - |
+ Update Prometheus Alertmanager and exporters to the latest releases:
+
+ * prometheus-alertmanager: 0.28.1 -> 0.31.1
+ * prometheus-blackbox-exporter: 0.27.0 -> 0.28.0
+ * prometheus-cadvisor: 0.53.0 -> 0.56.2
+ * prometheus-elasticsearch-exporter: 1.9.0 -> 1.10.0
+ * prometheus-libvirt-exporter: 2.2.0 -> 2.3.1
+ * prometheus-memcached-exporter: 0.15.3 -> 0.15.5
+ * prometheus-mysqld-exporter: 0.17.2 -> 0.18.0
+ * prometheus-node-exporter: 1.9.1 -> 1.10.2
+
+ prometheus-mtail and prometheus-openstack-exporter were not updated as
+ there are no later stable releases.