diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-06 15:22:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-06 15:22:01 +0000 |
| commit | 1ae1850557e3b99902f73b32c9005618537a1f2d (patch) | |
| tree | 14cc98a1b3b058e911675d588dd48fe39ffaa1d4 /docker | |
| parent | 3c88fb847c87755a831ee955419aff94befd2562 (diff) | |
| parent | a45e9053a3898312f7d11259887eae666d244a3c (diff) | |
| download | kolla-1ae1850557e3b99902f73b32c9005618537a1f2d.tar.gz kolla-1ae1850557e3b99902f73b32c9005618537a1f2d.zip | |
Merge "Install and start virtlogd in nova-libvirt-spice."
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt-spice/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt-spice/Dockerfile.j2 b/docker/nova/nova-libvirt-spice/Dockerfile.j2 index dd090a1e6..4c7ded894 100644 --- a/docker/nova/nova-libvirt-spice/Dockerfile.j2 +++ b/docker/nova/nova-libvirt-spice/Dockerfile.j2 @@ -33,6 +33,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', @@ -95,6 +96,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 %} @@ -109,7 +111,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-spice/kolla_nova_libvirt_start.sh b/docker/nova/nova-libvirt-spice/kolla_nova_libvirt_start.sh new file mode 100644 index 000000000..f06a63d9e --- /dev/null +++ b/docker/nova/nova-libvirt-spice/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 |