diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-03 14:24:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-03 14:24:44 +0000 |
| commit | f18a5505cd4ddc9c08a620979d3c6c0211a92f2d (patch) | |
| tree | f247728314a82374244018bdf3e8763d27a62c12 | |
| parent | 45d4191ddfdd579eb7b14c9e29f5550126698388 (diff) | |
| parent | 0c9d5c4c263bcc6afd65903adca74ff66e22ee59 (diff) | |
| download | kolla-f18a5505cd4ddc9c08a620979d3c6c0211a92f2d.tar.gz kolla-f18a5505cd4ddc9c08a620979d3c6c0211a92f2d.zip | |
Merge "Prevent virbr0 from being created by default"
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 3 |
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 %} |