diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-09 22:19:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-09 22:19:29 +0000 |
| commit | 56284a6dfb89ca01aee38aa4fa0a0a325774a5ab (patch) | |
| tree | 4c8fa525060b4dd881bc00871b884eb16ae1d91e /docker | |
| parent | 4290af63ca4d6d3d7080422979bcb5592b3160d2 (diff) | |
| parent | b3277ed2ca4df1fb1bf23565a9104d6b047e1ac1 (diff) | |
Merge "Only mount selinux sysfs in nova_libvirt container" into stable/pike
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/containers-common.yaml | 1 | ||||
| -rw-r--r-- | docker/services/nova-libvirt.yaml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml index 9f982f8b..2c894da5 100644 --- a/docker/services/containers-common.yaml +++ b/docker/services/containers-common.yaml @@ -64,7 +64,6 @@ outputs: # Syslog socket - /dev/log:/dev/log - /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro - - /sys/fs/selinux:/sys/fs/selinux - if: - internal_tls_enabled - - list_join: diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index f3fc6336..13dbec95 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -206,6 +206,7 @@ outputs: - /var/log/libvirt/qemu:/var/log/libvirt/qemu:ro - /var/log/containers/nova:/var/log/nova - /var/lib/vhost_sockets:/var/lib/vhost_sockets + - /sys/fs/selinux:/sys/fs/selinux - if: - use_tls_for_live_migration |