aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2016-04-21 01:08:04 -0400
committerSteven Dake <stdake@cisco.com>2016-04-21 03:00:45 -0400
commita861450fd29d7a2ea56eb755473da171443b38f6 (patch)
tree9ba3f91c7db0dddaa7ca444f57894a404b44af1e
parent549726484f93ffed9aa929f47a931c2f4588241f (diff)
downloadkolla-a861450fd29d7a2ea56eb755473da171443b38f6.tar.gz
kolla-a861450fd29d7a2ea56eb755473da171443b38f6.zip
Fix failure to deploy with qemu.conf
Closes-Bug: #1572819 Change-Id: I1f2edb482af1e85708159a0dba44a79427dc5af3
-rw-r--r--ansible/roles/nova/templates/qemu.conf.j21
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j21
2 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/nova/templates/qemu.conf.j2 b/ansible/roles/nova/templates/qemu.conf.j2
index e69de29bb..16bd9d4d9 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 d639408a6..65f3dedf6 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 %}