From 8b3f0d085712154d580e4a464ca7e88e612f2fb2 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Sun, 13 Mar 2016 22:47:35 +0000 Subject: Use ubuntu Mitaka repo The rabbitmq-server package is upgraded to 3.5.7 in cloud-archive so we update centos to match The xen-utils package now needs an explict version, xen-utils-4.6 is what is provided by cloud-archive mitaka Libvirt 1.3 is in the ubuntu cloud-archive. This has a new daemon for logging that needs further implementation in newton. For now, it has been disabled within the qemu.conf Co-Authored-By: Jeffrey Zhang TrivialFix Change-Id: I84217824817c484b6800a64cbd7767b127a3098e --- docker/nova/nova-libvirt/Dockerfile.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/nova') 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 %} -- cgit v1.2.3