aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-11-01 07:31:07 +0000
committerSam Yaple <sam@yaple.net>2015-11-01 21:27:54 +0000
commit0c9d5c4c263bcc6afd65903adca74ff66e22ee59 (patch)
tree37ed4e46633263a9a60c34d1fea82dcb61d80436
parent9bb405848932fcd97191a857cff2231239e904fe (diff)
downloadkolla-0c9d5c4c263bcc6afd65903adca74ff66e22ee59.tar.gz
kolla-0c9d5c4c263bcc6afd65903adca74ff66e22ee59.zip
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
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 29222da4e..1ccf0f5ff 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 %}