From 0c9d5c4c263bcc6afd65903adca74ff66e22ee59 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sun, 1 Nov 2015 07:31:07 +0000
Subject: [PATCH] Prevent virbr0 from being created by default

Small change to remove the default network since neutron handles all
of the bridge and veth creation. virbr0 becomes clutter.

CentOS doesn't seem to come with this default.xml network, so no
change there.

Note: This doesn't remove virbr0 from a running system, it only
prevents its creation.

Change-Id: I8e118ea285c674a47884bbe864df134133406bbc
Closes-Bug: #1512060
Potential-Backport: Liberty
---
 docker/nova/nova-libvirt/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 29222da4e3..1ccf0f5ff3 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -24,7 +24,8 @@ RUN apt-get install -y --no-install-recommends \
         qemu-block-extra \
         ebtables \
     && apt-get clean \
-    && mkdir -p /etc/ceph
+    && mkdir -p /etc/ceph \
+    && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml
 
 {% endif %}