Merge "Fix libvirt/qemu logs location" into stable/train
This commit is contained in:
commit
682b195247
|
@ -25,7 +25,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
description: The volumes needed to log to files in the host.
|
description: The volumes needed to log to files in the host.
|
||||||
value:
|
value:
|
||||||
- /var/log/containers/libvirt:/var/log/libvirt:z
|
- /var/log/containers/libvirt:/var/log/libvirt:shared,z # +qemu subdir
|
||||||
docker_config:
|
docker_config:
|
||||||
description: Extra containers needed for logging to file in the host.
|
description: Extra containers needed for logging to file in the host.
|
||||||
value: null
|
value: null
|
||||||
|
|
|
@ -694,7 +694,6 @@ outputs:
|
||||||
- /var/run/libvirt:/var/run/libvirt:shared
|
- /var/run/libvirt:/var/run/libvirt:shared
|
||||||
- /var/lib/libvirt:/var/lib/libvirt
|
- /var/lib/libvirt:/var/lib/libvirt
|
||||||
- /etc/libvirt/qemu:/etc/libvirt/qemu:ro
|
- /etc/libvirt/qemu:/etc/libvirt/qemu:ro
|
||||||
- /var/log/libvirt/qemu:/var/log/libvirt/qemu
|
|
||||||
- /var/lib/nova:/var/lib/nova:shared
|
- /var/lib/nova:/var/lib/nova:shared
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
|
@ -735,7 +734,6 @@ outputs:
|
||||||
- /var/run/libvirt:/var/run/libvirt:shared
|
- /var/run/libvirt:/var/run/libvirt:shared
|
||||||
- /var/cache/libvirt:/var/cache/libvirt:shared
|
- /var/cache/libvirt:/var/cache/libvirt:shared
|
||||||
- /var/lib/libvirt:/var/lib/libvirt:shared
|
- /var/lib/libvirt:/var/lib/libvirt:shared
|
||||||
- /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
|
|
||||||
- /var/lib/vhost_sockets:/var/lib/vhost_sockets
|
- /var/lib/vhost_sockets:/var/lib/vhost_sockets
|
||||||
- /var/lib/nova:/var/lib/nova:shared
|
- /var/lib/nova:/var/lib/nova:shared
|
||||||
- /sys/fs/selinux:/sys/fs/selinux
|
- /sys/fs/selinux:/sys/fs/selinux
|
||||||
|
@ -860,8 +858,6 @@ outputs:
|
||||||
- { 'path': /var/cache/libvirt }
|
- { 'path': /var/cache/libvirt }
|
||||||
- { 'path': /var/lib/nova, 'setype': svirt_sandbox_file_t }
|
- { 'path': /var/lib/nova, 'setype': svirt_sandbox_file_t }
|
||||||
- { 'path': /var/run/libvirt, 'setype': virt_var_run_t }
|
- { 'path': /var/run/libvirt, 'setype': virt_var_run_t }
|
||||||
- { 'path': /var/log/libvirt, 'setype': svirt_sandbox_file_t }
|
|
||||||
- { 'path': /var/log/libvirt/qemu, 'setype': svirt_sandbox_file_t }
|
|
||||||
# qemu user on host will be cretaed by libvirt package install, ensure
|
# qemu user on host will be cretaed by libvirt package install, ensure
|
||||||
# the qemu user created with same uid/gid as like libvirt package.
|
# the qemu user created with same uid/gid as like libvirt package.
|
||||||
# These specific values are required since ovs is running on host.
|
# These specific values are required since ovs is running on host.
|
||||||
|
|
Loading…
Reference in New Issue