From a861450fd29d7a2ea56eb755473da171443b38f6 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 21 Apr 2016 01:08:04 -0400 Subject: [PATCH] Fix failure to deploy with qemu.conf Closes-Bug: #1572819 Change-Id: I1f2edb482af1e85708159a0dba44a79427dc5af3 --- ansible/roles/nova/templates/qemu.conf.j2 | 1 + docker/nova/nova-libvirt/Dockerfile.j2 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/nova/templates/qemu.conf.j2 b/ansible/roles/nova/templates/qemu.conf.j2 index e69de29bb2..16bd9d4d9a 100644 --- a/ansible/roles/nova/templates/qemu.conf.j2 +++ b/ansible/roles/nova/templates/qemu.conf.j2 @@ -0,0 +1 @@ +stdio_handler = "file" diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index d639408a6f..65f3dedf6e 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -29,7 +29,6 @@ RUN apt-get install -y --no-install-recommends \ && apt-get clean \ && mkdir -p /etc/ceph \ && 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 \ && usermod -a -G libvirtd nova {% endif %}