openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Correct label for /run/libvirt" into stable/wallaby

This commit is contained in:
Zuul 2022-09-21 22:52:36 +00:00 committed by Gerrit Code Review
parent 0b9a4e01c4 4b4015aaaa
commit 1762a2b057
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -105,7 +105,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
- - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/log/containers/ceilometer:/var/log/ceilometer:z
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

10
deployment/deprecated/nova/nova-libvirt-container-puppet.yaml
View File

@ -573,7 +573,7 @@ outputs:
- /dev:/dev
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu:ro
- /var/lib/nova:/var/lib/nova:shared
@ -624,7 +624,7 @@ outputs:
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /etc/libvirt:/etc/libvirt
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt:shared
- /var/cache/libvirt:/var/cache/libvirt:shared
- /var/lib/vhost_sockets:/var/lib/vhost_sockets
@ -661,7 +661,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
- - /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova:/etc/nova
- /etc/libvirt:/etc/libvirt
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt:shared
- /var/lib/container-config-scripts/nova_libvirt_init_secret.sh:/nova_libvirt_init_secret.sh:ro
- str_replace:
@ -884,8 +884,8 @@ outputs:
- { 'path': /var/lib/libvirt, 'setype': container_file_t }
- { 'path': /var/cache/libvirt }
- { 'path': /var/lib/nova, 'setype': container_file_t }
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
# qemu user on host will be cretaed by libvirt package install, ensure
- { 'path': /run/libvirt}
# qemu user on host will be created 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.
# Once ovs with DPDK is containerized, we could modify this uid/gid

2
deployment/nova/nova-libvirt-common.yaml
View File

@ -151,7 +151,7 @@ outputs:
- /etc/selinux/config:/etc/selinux/config:ro
- /etc/libvirt:/etc/libvirt:shared
- /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/nova:/var/lib/nova:shared
- /var/lib/libvirt:/var/lib/libvirt:shared
- /var/cache/libvirt:/var/cache/libvirt:shared

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

@ -716,7 +716,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
- - /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova:/etc/nova
- /etc/libvirt:/etc/libvirt
- /run/libvirt:/run/libvirt:shared
- /run/libvirt:/run/libvirt:shared,z
- /var/lib/libvirt:/var/lib/libvirt:shared
- /var/lib/container-config-scripts/nova_libvirt_init_secret.sh:/nova_libvirt_init_secret.sh:ro
- str_replace:
@ -929,7 +929,7 @@ outputs:
- { 'path': /var/lib/libvirt, 'setype': container_file_t }
- { 'path': /var/cache/libvirt }
- { 'path': /var/lib/nova, 'setype': container_file_t }
- { 'path': /run/libvirt, 'setype': virt_var_run_t }
- { 'path': /run/libvirt }
- { 'path': /var/log/libvirt, 'setype': container_file_t }
- { 'path': /var/log/libvirt/qemu, 'setype': container_file_t }
- { 'path': /var/log/containers/libvirt/swtpm, 'setype': container_file_t, 'mode': '0750' }