From e36dd064a9fe6b9a934d2681b80f7881763c3c68 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 9 Jun 2025 18:41:30 +0200 Subject: [PATCH 01/14] telegraf: Deprecate support Change-Id: Ib95fc21ed380d0eccc5ee3434cebc348c1088352 --- releasenotes/notes/deprecate-telegraf-db2b0b9f30591552.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releasenotes/notes/deprecate-telegraf-db2b0b9f30591552.yaml diff --git a/releasenotes/notes/deprecate-telegraf-db2b0b9f30591552.yaml b/releasenotes/notes/deprecate-telegraf-db2b0b9f30591552.yaml new file mode 100644 index 0000000000..7aa96baff9 --- /dev/null +++ b/releasenotes/notes/deprecate-telegraf-db2b0b9f30591552.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Deprecates support for building ``telegraf`` images. From fb0ebb2380abbab1785a21a558a6d04e45240351 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 9 Jun 2025 18:45:01 +0200 Subject: [PATCH 02/14] collectd: Deprecate support Change-Id: I26550599b8ea7ea17687475154b3070aaed659e9 --- releasenotes/notes/deprecate-collectd-8ba94052bdc9424b.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releasenotes/notes/deprecate-collectd-8ba94052bdc9424b.yaml diff --git a/releasenotes/notes/deprecate-collectd-8ba94052bdc9424b.yaml b/releasenotes/notes/deprecate-collectd-8ba94052bdc9424b.yaml new file mode 100644 index 0000000000..c41b720f96 --- /dev/null +++ b/releasenotes/notes/deprecate-collectd-8ba94052bdc9424b.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Deprecates support for building ``collectd`` images. From 0d2429af233814b5bbc330388399d6dbf70c836e Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 11 Jun 2025 17:28:50 +0200 Subject: [PATCH 03/14] Copy aodh's api-paste to /etc as default Normally, for other images, we simply copy etc/*, but Aodh has its api-paste located elsewhere. This patch copies the default Aodh api-paste into /etc/aodh/. Signed-off-by: Michal Arbet Change-Id: I5eccc1b994c537e1d1adea21520d045674a9d41c --- docker/aodh/aodh-base/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index db9d507f49..39e785dc82 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -28,6 +28,8 @@ RUN ln -s aodh-base-source/* aodh \ && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/aodh /var/www/cgi-bin/aodh \ && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \ + && cp /aodh/aodh/api/api-paste.ini /etc/aodh/ \ + && chmod 644 /etc/aodh/api-paste.ini \ && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \ && chmod 755 /var/www/cgi-bin/aodh \ From b0714b2e98e1a46a445c3ca8ae4b9dc85bfdeef3 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 14 Jul 2025 07:36:40 +0200 Subject: [PATCH 04/14] heat: Ensure log files are owned by heat user Change-Id: I4567aaf352f1f590af2fa7d067768799adad64d1 Signed-off-by: Michal Nasiadka --- docker/heat/heat-base/extend_start.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh index a73f17345f..1c1e86b8e1 100644 --- a/docker/heat/heat-base/extend_start.sh +++ b/docker/heat/heat-base/extend_start.sh @@ -3,6 +3,9 @@ if [[ ! -d "/var/log/kolla/heat" ]]; then mkdir -p /var/log/kolla/heat fi +if [[ $(stat -c %U:%G /var/log/kolla/heat) != "heat:kolla" ]]; then + chown -R heat:kolla /var/log/kolla/heat +fi if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then chmod 755 /var/log/kolla/heat fi From edd9933fdef22202d45da04c53cf739958ecaa27 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 14 Jul 2025 07:33:44 +0200 Subject: [PATCH 05/14] masakari: Ensure log files are owned by masakari user Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/954903 Change-Id: Icc2fe528956a0fb47dd66344d414c81212705480 Signed-off-by: Michal Nasiadka --- docker/masakari/masakari-base/extend_start.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/masakari/masakari-base/extend_start.sh b/docker/masakari/masakari-base/extend_start.sh index d4fdcc86a7..4f13d3e8b5 100755 --- a/docker/masakari/masakari-base/extend_start.sh +++ b/docker/masakari/masakari-base/extend_start.sh @@ -3,6 +3,9 @@ if [[ ! -d "/var/log/kolla/masakari" ]]; then mkdir -p /var/log/kolla/masakari fi +if [[ $(stat -c %U:%G /var/log/kolla/masakari) != "masakari:kolla" ]]; then + chown -R masakari:kolla /var/log/kolla/masakari +fi if [[ $(stat -c %a /var/log/kolla/masakari) != "755" ]]; then chmod 755 /var/log/kolla/masakari fi From f25cf12455e3180dd422581c96e2a73df5d1d666 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Mon, 4 Aug 2025 14:13:34 +0200 Subject: [PATCH 06/14] update debian release in support matrix it was omitted in Caracal cycle Change-Id: I913208b09771bc18ad3214d7518a837d762f6c33 Signed-off-by: Bartosz Bezak --- doc/source/support_matrix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 3598e839ef..05f2d5693a 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -18,7 +18,7 @@ The following base container images are supported: Distribution Default base Default base tag ================== =============================== ================ Rocky Linux quay.io/rockylinux/rockylinux 9 -Debian Bullseye debian bullseye +Debian Bookworm debian bookworm Ubuntu Noble ubuntu 24.04 ================== =============================== ================ From ddac7ca1ed393609b7bda8753db3598f1ae02648 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Mon, 4 Aug 2025 11:31:26 +0200 Subject: [PATCH 07/14] send empty X-Registry-Auth for anonymous pushes Since Docker 28.3.3 the daemon rejects a push that carries no `X-Registry-Auth` header [1]. The SDK already sets this header when it finds credentials, so the breakage happens only on anonymous pushes. During `PushTask.push_image()` we now check whether the SDK can resolve credentials for the target registry; if it cannot, we inject `auth_config={}`, causing the SDK to send the minimal "{}" header that satisfies the daemon while leaving authenticated pushes unchanged. Drop this addition when [2] is fixed. [1] https://github.com/moby/moby/pull/50371 [2] https://github.com/docker/docker-py/issues/3348 Closes-Bug: #2119619 Change-Id: I7a2f3fce223afd74741b40bf62836b325fca5b19 Signed-off-by: Bartosz Bezak --- kolla/image/tasks.py | 10 ++++++++++ kolla/tests/test_build.py | 20 +++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/kolla/image/tasks.py b/kolla/image/tasks.py index 28af3d52d0..39d7593907 100644 --- a/kolla/image/tasks.py +++ b/kolla/image/tasks.py @@ -119,6 +119,16 @@ def run(self): def push_image(self, image): kwargs = dict(stream=True, decode=True) + # NOTE(bbezak): Docker ≥ 28.3.3 rejects a push with no + # X-Registry-Auth header (moby/moby#50371, docker-py#3348). + # If the SDK cannot find creds for this registry, we inject + # an empty {} so the daemon still accepts the request. + # TODO(bbezak): Remove fallback once docker-py handles empty auth + if self.conf.engine == engine.Engine.DOCKER.value: + from docker.auth import resolve_authconfig + if not resolve_authconfig(self.engine_client.api._auth_configs, + registry=self.conf.registry): + kwargs.setdefault("auth_config", {}) for response in self.engine_client.images.push(image.canonical_name, **kwargs): diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index ca2faa0561..deb2dfa103 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -81,10 +81,12 @@ def setUp(self): @mock.patch(engine_client) def test_push_image(self, mock_client): self.engine_client = mock_client + mock_client().api._auth_configs = {} pusher = tasks.PushTask(self.conf, self.image) pusher.run() mock_client().images.push.assert_called_once_with( - self.image.canonical_name, decode=True, stream=True) + self.image.canonical_name, + decode=True, stream=True, auth_config={}) self.assertTrue(pusher.success) @mock.patch.dict(os.environ, clear=True) @@ -92,11 +94,13 @@ def test_push_image(self, mock_client): def test_push_image_failure(self, mock_client): """failure on connecting Docker API""" self.engine_client = mock_client + mock_client().api._auth_configs = {} mock_client().images.push.side_effect = Exception pusher = tasks.PushTask(self.conf, self.image) pusher.run() mock_client().images.push.assert_called_once_with( - self.image.canonical_name, decode=True, stream=True) + self.image.canonical_name, + decode=True, stream=True, auth_config={}) self.assertFalse(pusher.success) self.assertEqual(utils.Status.PUSH_ERROR, self.image.status) @@ -105,11 +109,13 @@ def test_push_image_failure(self, mock_client): def test_push_image_failure_retry(self, mock_client): """failure on connecting Docker API, success on retry""" self.engine_client = mock_client + mock_client().api._auth_configs = {} mock_client().images.push.side_effect = [Exception, []] pusher = tasks.PushTask(self.conf, self.image) pusher.run() mock_client().images.push.assert_called_once_with( - self.image.canonical_name, decode=True, stream=True) + self.image.canonical_name, + decode=True, stream=True, auth_config={}) self.assertFalse(pusher.success) self.assertEqual(utils.Status.PUSH_ERROR, self.image.status) @@ -125,12 +131,14 @@ def test_push_image_failure_retry(self, mock_client): def test_push_image_failure_error(self, mock_client): """Docker connected, failure to push""" self.engine_client = mock_client + mock_client().api._auth_configs = {} mock_client().images.push.return_value = [{'errorDetail': {'message': 'mock push fail'}}] pusher = tasks.PushTask(self.conf, self.image) pusher.run() mock_client().images.push.assert_called_once_with( - self.image.canonical_name, decode=True, stream=True) + self.image.canonical_name, + decode=True, stream=True, auth_config={}) self.assertFalse(pusher.success) self.assertEqual(utils.Status.PUSH_ERROR, self.image.status) @@ -139,12 +147,14 @@ def test_push_image_failure_error(self, mock_client): def test_push_image_failure_error_retry(self, mock_client): """Docker connected, failure to push, success on retry""" self.engine_client = mock_client + mock_client().api._auth_configs = {} mock_client().images.push.return_value = [{'errorDetail': {'message': 'mock push fail'}}] pusher = tasks.PushTask(self.conf, self.image) pusher.run() mock_client().images.push.assert_called_once_with( - self.image.canonical_name, decode=True, stream=True) + self.image.canonical_name, + decode=True, stream=True, auth_config={}) self.assertFalse(pusher.success) self.assertEqual(utils.Status.PUSH_ERROR, self.image.status) From 63c4202d207b6b4686156bca81c84ca756513f3c Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 6 Aug 2025 11:56:43 +0200 Subject: [PATCH 08/14] ironic: Stop copying rootwrap since Ironic dropped it See I0a8e26e8990eae8108537541159f7810d35b70f1 Change-Id: I95500612168871454ce269b3562a8daccdf4de4f Signed-off-by: Michal Nasiadka --- docker/ironic/ironic-base/Dockerfile.j2 | 2 -- docker/ironic/ironic-base/ironic_sudoers | 1 - 2 files changed, 3 deletions(-) diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 2002438c02..86f1d70148 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -21,9 +21,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN ln -s ironic-base-source/* ironic \ && {{ macros.install_pip(ironic_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ironic \ - && cp -r /var/lib/kolla/venv/etc/ironic/* /etc/ironic/ \ && cp /var/lib/kolla/venv/etc/pycadf/ironic_api_audit_map.conf /etc/ironic/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ironic/rootwrap.conf \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_ironic_sudoers \ && touch /usr/local/bin/kolla_ironic_extend_start \ diff --git a/docker/ironic/ironic-base/ironic_sudoers b/docker/ironic/ironic-base/ironic_sudoers index 1a3f32e1af..9b9deed4d1 100644 --- a/docker/ironic/ironic-base/ironic_sudoers +++ b/docker/ironic/ironic-base/ironic_sudoers @@ -1,4 +1,3 @@ -ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf * ironic ALL = (root) NOPASSWD: /bin/mkdir -p /var/lib/ironic-metrics, /usr/bin/mkdir -p /var/lib/ironic-metrics ironic ALL = (root) NOPASSWD: /bin/chown ironic\:ironic /var/lib/ironic-metrics, /usr/bin/chown ironic\:ironic /var/lib/ironic-metrics ironic ALL = (root) NOPASSWD: /bin/chmod 2755 /var/lib/ironic-metrics, /usr/bin/chmod 2775 /var/lib/ironic-metrics From bbc842720c0b56f79cf28e7156dd13ff8deb537f Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 6 Aug 2025 15:57:47 +0200 Subject: [PATCH 09/14] keystone: Add local wsgi file It has been removed with I9fa7cd60bf27768db06f69681675fce2e55712af Change-Id: Ib42be3d56bdb64247ac6f17b8ac1f1baa873f475 Signed-off-by: Michal Nasiadka --- docker/keystone/keystone-base/Dockerfile.j2 | 9 +++------ docker/keystone/keystone-base/wsgi | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 docker/keystone/keystone-base/wsgi diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 8996a8e75d..128c841487 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -33,6 +33,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block keystone_source_install %} ADD keystone-base-archive /keystone-base-source +ADD wsgi /var/lib/kolla/venv/bin/keystone-wsgi-public {% set keystone_base_pip_packages = [ '/keystone[ldap]', @@ -40,14 +41,10 @@ ADD keystone-base-archive /keystone-base-source RUN ln -s keystone-base-source/* keystone \ && {{ macros.install_pip(keystone_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/keystone /var/www/cgi-bin/keystone \ - && cp -r /keystone/etc/* /etc/keystone/ \ - && cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ - && cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main + && mkdir -p /etc/keystone \ + && cp -r /keystone/etc/* /etc/keystone/ {% endblock %} -RUN chmod 755 /var/www/cgi-bin/keystone/* - {{ macros.kolla_patch_sources() }} {% block keystone_base_footer %}{% endblock %} diff --git a/docker/keystone/keystone-base/wsgi b/docker/keystone/keystone-base/wsgi new file mode 100644 index 0000000000..852ee95eb9 --- /dev/null +++ b/docker/keystone/keystone-base/wsgi @@ -0,0 +1,2 @@ +#!/var/lib/kolla/venv/bin/python +from keystone.wsgi.api import application From 6ec52073b62aee431772293afb85f248b2709b09 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 7 Aug 2025 11:17:29 +0200 Subject: [PATCH 10/14] CI: use opendevmirror for debian/ubuntu builds Depends-On: https://review.opendev.org/c/opendev/system-config/+/956760 Change-Id: I136bb702b20e941611dd90830e81c9d358a2e355 Signed-off-by: Bartosz Bezak --- tests/playbooks/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index c946343a53..ad3c80075d 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -29,7 +29,7 @@ vars: kolla_mirror_config: DEFAULT: - base_image: "quay.io/openstack.kolla/{{ base_distro }}" + base_image: "quay.io/opendevmirror/{{ base_distro }}" ansible.builtin.set_fact: kolla_build_config: "{{ kolla_build_config | combine(kolla_mirror_config, recursive=True) }}" when: base_distro in ['debian', 'ubuntu'] From fa487adcf059e4f5c61957d530fe146c4b600d1f Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 6 Aug 2025 16:00:49 +0200 Subject: [PATCH 11/14] manila: Drop copying of wsgi files They have been removed with Icaba9424862b883388bf68d2c3d48138b7b906b0 Not creating local versions like with keystone because Kolla-Ansible does not use WSGI for Manila yet. Change-Id: Ia34d848d8641e43681c602c9c4433364e8be1d92 Signed-off-by: Michal Nasiadka --- docker/manila/manila-api/Dockerfile.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 817933cfcd..4e13321f53 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -13,10 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start -RUN mkdir -p /var/www/cgi-bin/manila \ - && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \ - && chmod 644 /usr/local/bin/kolla_manila_extend_start \ - && chmod 755 /var/www/cgi-bin/manila/manila-wsgi +RUN chmod 644 /usr/local/bin/kolla_manila_extend_start {{ macros.kolla_patch_sources() }} From e478adcbe63d81faa44bc09f72461fd6a7fcdf94 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 7 Aug 2025 16:22:16 +0200 Subject: [PATCH 12/14] mariadb: pin to 10.11.13 Closes-Bug: #2119954 Change-Id: I1e334b47c6ab16eb032458141faae55cf39e3eb4 Signed-off-by: Pierre Riteau --- docker/base/mariadb.repo | 2 +- kolla/template/repos.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 07d97ef205..4e5f1f1071 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch +baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11.13/yum/rhel/$releasever/$basearch gpgcheck = 1 enabled = 0 module_hotfixes = 1 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a72e734ce7..570ce95ba6 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -69,7 +69,7 @@ debian: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -121,7 +121,7 @@ debian-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -215,7 +215,7 @@ ubuntu: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" @@ -268,7 +268,7 @@ ubuntu-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" From e77d2ba7942c833c7705ef9a879ce85a62879e93 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 12 Aug 2025 07:17:30 +0000 Subject: [PATCH 13/14] Revert "mariadb: pin to 10.11.13" This reverts commit e478adcbe63d81faa44bc09f72461fd6a7fcdf94. Reason for revert: mariabackup fixed Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/957087 Change-Id: Ib694d3be0d2a199469690a01ba17a3349f3802b1 Signed-off-by: Michal Nasiadka --- docker/base/mariadb.repo | 2 +- kolla/template/repos.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 4e5f1f1071..07d97ef205 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11.13/yum/rhel/$releasever/$basearch +baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch gpgcheck = 1 enabled = 0 module_hotfixes = 1 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 570ce95ba6..a72e734ce7 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -69,7 +69,7 @@ debian: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -121,7 +121,7 @@ debian-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/debian" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" suite: "bookworm" component: "main" gpg_key: "mariadb.gpg" @@ -215,7 +215,7 @@ ubuntu: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" @@ -268,7 +268,7 @@ ubuntu-aarch64: component: "stable" gpg_key: "influxdb.asc" mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.13/repo/ubuntu" + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" suite: "noble" component: "main" gpg_key: "mariadb.gpg" From ed094e0af4caa2bcd5d574e6c9f4079be074347b Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Wed, 13 Aug 2025 17:01:56 +0100 Subject: [PATCH 14/14] Bump libvirt exporter Bumps libvirt exporter source from v1.6.0 to v2.2.0. This fixes some metrics that were lost when the exporter was changed from the old "tinkoff" source to "inovex". See also Icc8a3651d601ab45d448c9d252ca6155219d21cf Closes-Bug: #2120639 Change-Id: Ib738325603173157b4c482f9de6d5d9cea0b758a Signed-off-by: Alex Welsh --- kolla/common/sources.py | 6 +++--- releasenotes/notes/bug-2120639-74c180bd812ddcf7.yaml | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-2120639-74c180bd812ddcf7.yaml diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 7a82fd1e9b..9449c060f1 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -318,11 +318,11 @@ 'elasticsearch_exporter' '-${version}.linux-${debian_arch}.tar.gz')}, 'prometheus-libvirt-exporter': { - 'version': '1.6.0', + 'version': '2.2.0', 'type': 'url', 'sha256': { - 'amd64': '57f1e71ac5bd87f18a40b9089e9fb513dec44ced58328b3065879b279f967596', # noqa: E501 - 'arm64': '8f474fbb515caf19fda92c839eece761738138c7c676d12d10aa0b8c29b3ef9d'}, # noqa: E501 + 'amd64': '37e26779be1ebaef2e76d7304a3d3ecfbdc232a5c57645ee0f97b13f014bd842', # noqa: E501 + 'arm64': '94ac011349d60d70c14985df2942d02ecac87c0b7c7a468133394eb1800a22b0'}, # noqa: E501 'location': ('https://github.com/' 'inovex/prometheus-libvirt-exporter/' 'releases/download/v${version}/' diff --git a/releasenotes/notes/bug-2120639-74c180bd812ddcf7.yaml b/releasenotes/notes/bug-2120639-74c180bd812ddcf7.yaml new file mode 100644 index 0000000000..0b77a1bf8c --- /dev/null +++ b/releasenotes/notes/bug-2120639-74c180bd812ddcf7.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + Fixed missing metrics in Prometheus libvirt exporter. + + The Prometheus libvirt exporter has been bumped from ``v1.6.0`` to + ``v2.2.0``. This restores some metrics that were lost when the exporter + source was changed in a previous release. + + `LP#2120639 `__.