diff options
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh | 12 | ||||
| -rw-r--r-- | kolla/common/sources.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/update-prometheus-server-3.5.4-70f6b76854015b51.yaml | 4 | ||||
| -rw-r--r-- | zuul.d/debian.yaml | 2 | ||||
| -rw-r--r-- | zuul.d/ubuntu.yaml | 2 |
6 files changed, 27 insertions, 4 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 88e4a52d6..b866917ea 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -20,6 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libguestfs', 'libvirt-client', 'libvirt-daemon', + 'libvirt-daemon-log', 'libvirt-daemon-config-nwfilter', 'libvirt-daemon-driver-nwfilter', 'libvirt-daemon-driver-nodedev', @@ -75,6 +76,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['debian'] %} {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'libvirt-daemon-log', 'usermode' ] %} {% endif %} @@ -89,7 +91,8 @@ RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/auto {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 644 /usr/local/bin/kolla_extend_start +COPY kolla_nova_libvirt_start.sh /usr/local/bin/kolla_nova_libvirt_start +RUN chmod 644 /usr/local/bin/kolla_extend_start && chmod 744 /usr/local/bin/kolla_nova_libvirt_start {{ macros.kolla_patch_sources() }} diff --git a/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh b/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh new file mode 100644 index 000000000..f06a63d9e --- /dev/null +++ b/docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -euo pipefail + +# NOTE(mikal): Start virtlogd as a sidecar. We need this for +# nova instance console logs to rotate. Otherwise they will +# consume unbounded amounts of disk. +# +# No exec here: libvirtd will be the "main" process. +/usr/sbin/virtlogd & + +# Now hand over PID 1's direct child role to libvirtd. +exec /usr/sbin/libvirtd --listen diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 97edec1b1..6284eaa1b 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -384,11 +384,11 @@ SOURCES = { 'openstack-network-exporter' '-linux-${debian_arch}')}, 'prometheus-server': { - 'version': '3.5.3', + 'version': '3.5.4', 'type': 'url', 'sha256': { - 'amd64': '8c30b9d99664e39b0363c0ba54fab30a7958e9d3de27246bf26ed85e6cfb8946', # noqa: E501 - 'arm64': '11457bc76cab34f5ac05ba05fb80cfca1e8be7e4b31ae7c054879ce1066cb9a5'}, # noqa: E501 + 'amd64': 'be64e1cf657e6e7d132aca022f6135abedd660db053952e3f69e8affa3b9cc9e', # noqa: E501 + 'arm64': '97634b9b6ed9ef18689e3b3572f1b277714650657516494fd164dcc53c1d3f48'}, # noqa: E501 'location': ('https://github.com/' 'prometheus/prometheus/' 'releases/download/v${version}/' diff --git a/releasenotes/notes/update-prometheus-server-3.5.4-70f6b76854015b51.yaml b/releasenotes/notes/update-prometheus-server-3.5.4-70f6b76854015b51.yaml new file mode 100644 index 000000000..80bbb5091 --- /dev/null +++ b/releasenotes/notes/update-prometheus-server-3.5.4-70f6b76854015b51.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Updates Prometheus to version 3.5.4. diff --git a/zuul.d/debian.yaml b/zuul.d/debian.yaml index 7088c0711..f244449bb 100644 --- a/zuul.d/debian.yaml +++ b/zuul.d/debian.yaml @@ -65,4 +65,6 @@ periodic-stable: jobs: - kolla-publish-debian-trixie-quay + periodic-weekly: + jobs: - kolla-publish-debian-trixie-arm64-quay diff --git a/zuul.d/ubuntu.yaml b/zuul.d/ubuntu.yaml index e6c7c285c..0cc995989 100644 --- a/zuul.d/ubuntu.yaml +++ b/zuul.d/ubuntu.yaml @@ -65,4 +65,6 @@ periodic-stable: jobs: - kolla-publish-ubuntu-noble-quay + periodic-weekly: + jobs: - kolla-publish-ubuntu-noble-arm64-quay |