diff options
| author | Zuul <zuul@review.opendev.org> | 2026-06-23 10:24:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-06-23 10:24:10 +0000 |
| commit | 9211545f9b2fc6ffe8afe2561812eba9e1c89368 (patch) | |
| tree | 3107ac5961c7a22ac74de81eef69e0665832fd64 | |
| parent | 11afc796b3a4a4ca2e83072c829fdd4ea9aaa505 (diff) | |
| parent | 5629b0d05797b37723a3b524daff421d3ab17a2b (diff) | |
| download | kolla-9211545f9b2fc6ffe8afe2561812eba9e1c89368.tar.gz kolla-9211545f9b2fc6ffe8afe2561812eba9e1c89368.zip | |
Merge "Install and start virtlogd in nova-libvirt." into stable/2025.2
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/kolla_nova_libvirt_start.sh | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 0f22b60f3..b2dd717ab 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', @@ -94,7 +95,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 |