diff options
| author | SamYaple <sam@yaple.net> | 2016-03-13 22:47:35 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2016-03-14 15:52:48 +0000 |
| commit | 8b3f0d085712154d580e4a464ca7e88e612f2fb2 (patch) | |
| tree | 83d9fae3ea95c00333ffbf6252aad87329ee81e7 /docker/nova/nova-libvirt | |
| parent | 9500bd239ac122ae41de6086112e5e5335ed1558 (diff) | |
| download | kolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.tar.gz kolla-8b3f0d085712154d580e4a464ca7e88e612f2fb2.zip | |
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 <jeffrey.zhang@99cloud.net>
TrivialFix
Change-Id: I84217824817c484b6800a64cbd7767b127a3098e
Diffstat (limited to 'docker/nova/nova-libvirt')
| -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 %} |