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

deployment/logging/files/nova-libvirt.yaml

@@ -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

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -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.