Merge "nova-libvirt: conditionalize selinux bind-mount"

This commit is contained in:
Zuul 2019-01-17 11:16:59 +00:00 committed by Gerrit Code Review
commit 243044e652

@ -134,6 +134,13 @@ parameters:
tags:
- role_specific
ContainerCli:
type: string
default: 'docker'
description: CLI tool used to manage containers.
constraints:
- allowed_values: ['docker', 'podman']
conditions:
use_tls_for_live_migration:
@ -179,6 +186,11 @@ conditions:
- {get_param: QemuMemoryBackingDir}
- ''
docker_enabled:
equals:
- {get_param: ContainerCli}
- 'docker'
resources:
RoleParametersValue:
type: OS::Heat::Value
@ -345,7 +357,12 @@ outputs:
- /var/log/containers/libvirt:/var/log/libvirt:z
- /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro
- /var/lib/vhost_sockets:/var/lib/vhost_sockets:z
- /sys/fs/selinux:/sys/fs/selinux
-
if:
- docker_enabled
-
- /sys/fs/selinux:/sys/fs/selinux
- null
-
if:
- use_tls_for_live_migration