openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix libvirt/qemu logs location 

Fix bind-mount to point /var/log/containers/libvirt/(qemu)
on the host, via the shared NovaLibvirtLogging attribute.

Remove the nested libvirt/qemu path bind-mount since the outer libvirt
directory is sufficient to hold the qemu logs as well. For that,
bind-mount it with the shared mounts propagation mode.

Change-Id: Iccbae5589aa4a4fc449f23b82755dea1f54f5678
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 56a58f88e9)
This commit is contained in:
Bogdan Dobrelya 2021-11-12 11:43:28 +01:00
parent 498b6bec49
commit 3011d4c53b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/logging/files/nova-libvirt.yaml
View File

@ -38,7 +38,7 @@ outputs:
volumes:
description: The volumes needed to log to files in the host.
value:
- /var/log/containers/libvirt:/var/log/libvirt:z
- /var/log/containers/libvirt:/var/log/libvirt:shared,z # +qemu subdir
docker_config:
description: Extra containers needed for logging to file in the host.
value: null

4
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -692,7 +692,6 @@ outputs:
- /run/libvirt:/run/libvirt:shared
- /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu:ro
- /var/log/libvirt/qemu:/var/log/libvirt/qemu
- /var/lib/nova:/var/lib/nova:shared
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
@ -732,7 +731,6 @@ outputs:
- /run/libvirt:/run/libvirt:shared
- /var/lib/libvirt:/var/lib/libvirt:shared
- /var/cache/libvirt:/var/cache/libvirt:shared
- /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
- /var/lib/vhost_sockets:/var/lib/vhost_sockets
- /var/lib/nova:/var/lib/nova:shared
- /sys/fs/selinux:/sys/fs/selinux
@ -850,8 +848,6 @@ outputs:
- { 'path': /var/cache/libvirt }
- { 'path': /var/lib/nova, 'setype': container_file_t }
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
- { 'path': /var/log/libvirt, 'setype': container_file_t }
- { 'path': /var/log/libvirt/qemu, 'setype': container_file_t }
# qemu user on host will be cretaed by libvirt package install, ensure
# the qemu user created with same uid/gid as like libvirt package.
# These specific values are required since ovs is running on host.