diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-15 02:35:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-15 02:35:47 +0000 |
| commit | 439188cedbae289897d9d392681096928023258d (patch) | |
| tree | 1966449921ee239ea740e4b631acc7cf3265267f /docker/nova | |
| parent | 302b0302166ddfec43608e34bbcfaff6ce0c4545 (diff) | |
| parent | 8b3f0d085712154d580e4a464ca7e88e612f2fb2 (diff) | |
| download | kolla-439188cedbae289897d9d392681096928023258d.tar.gz kolla-439188cedbae289897d9d392681096928023258d.zip | |
Merge "Use ubuntu Mitaka repo"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index fb1f396af..028d4635a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -23,10 +23,11 @@ RUN apt-get install -y --no-install-recommends \ qemu \ qemu-block-extra \ ebtables \ - xen-utils \ + xen-utils-4.6 \ && apt-get clean \ && mkdir -p /etc/ceph \ - && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml + && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \ + && sed -i 's|.*stdio_handler.*|stdio_handler = "file"|' /etc/libvirt/qemu.conf {% endif %} |