summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2016-12-22 19:14:07 +0100
committerMartin André <m.andre@redhat.com>2016-12-22 19:14:07 +0100
commit356b961145517115b2a31eb8732873521ae91c2b (patch)
tree75b53c2aca314d556c35eaff515df1e96e58393f /docker/services
parent5c272e9de39ca3d06158d23b30f12107c8251d1d (diff)
Use provided qemu.conf in libvirt container
This allows us to workaround an issue where the default setting for qemu changed to logging to virtlogd which is not yet containerized. Change-Id: I9d25b1299c4f02068d1073c5b78d4c7a2099721e Depends-On: I9a9705e5c79eec3bbaf02b491498886b858b7a95 Closes-Bug: #1652119
Diffstat (limited to 'docker/services')
-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 36511557..33b8ee04 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