openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use provided qemu.conf in libvirt container"

Browse Source
This commit is contained in:
Jenkins 2017-01-13 16:04:22 +00:00 committed by Gerrit Code Review
commit 3de1aa200a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/nova-libvirt.yaml
View File

@ -55,6 +55,11 @@ outputs:
volumes:
- /var/lib/etc-data/json-config/nova-libvirt.json:/var/lib/kolla/config_files/config.json
- /var/lib/etc-data/libvirt/libvirtd.conf:/var/lib/kolla/config_files/libvirtd.conf
# NOTE(mandre) Ideally the qemu.conf file is mounted in
# /var/lib/kolla/config_files and copied to the right place but
# copy-json.py doesn't allow us to do that without appending the
# file as an additional config on the CLI
- /var/lib/etc-data/libvirt/qemu.conf:/etc/libvirt/qemu.conf:ro
- /etc/localtime:/etc/localtime:ro
- /lib/modules:/lib/modules:ro
- /run:/run