openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix libvirt/qemu logs location" into stable/wallaby

This commit is contained in:
Zuul 2021-10-05 07:25:51 +00:00 committed by Gerrit Code Review
parent a489da07ac dc4d62065e
commit b32614fb38
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

@ -58,7 +58,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

@ -570,7 +570,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
- if:
- {get_param: NovaEnableVirtlogdContainerWrapper}
@ -622,7 +621,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
@ -858,8 +856,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.