summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-13 16:04:22 +0000
committerGerrit Code Review <review@openstack.org>2017-01-13 16:04:22 +0000
commit3de1aa200acf97914bf0bbbe977c3ddd0bd7a734 (patch)
treee3281a0db3f263171d5a02a4e551598c0be46d71
parent898e1c31836724447030068fd313f4fdae826d0d (diff)
parent356b961145517115b2a31eb8732873521ae91c2b (diff)
Merge "Use provided qemu.conf in libvirt container"
-rw-r--r--docker/services/nova-libvirt.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index 2dfeed59..a40a21fd 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -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