From d41b9dc5ac6b3a41a88baef9b83e9ccf4779ac2a Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Tue, 21 Oct 2014 15:56:42 -0400
Subject: [PATCH] workarounds for nova networking

this patch creates a dummy interface ("flat0") and uses that for
flat_interface.  This prevents nova from breaking container networking
when it adds the container eth0 to the nova bridge (br100).

Change-Id: I93c696a8476228d6bbca678748170c2a11d5af11
---
 docker/nova-base/config-nova.sh           | 2 +-
 docker/nova-compute/nova-network/start.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh
index 56b673944d..a0c121ac40 100755
--- a/docker/nova-base/config-nova.sh
+++ b/docker/nova-base/config-nova.sh
@@ -75,7 +75,7 @@ crudini --set /etc/nova/nova.conf DEFAULT multi_host True
 crudini --set /etc/nova/nova.conf DEFAULT send_arp_for_ha True
 crudini --set /etc/nova/nova.conf DEFAULT share_dhcp_address True
 crudini --set /etc/nova/nova.conf DEFAULT force_dhcp_release True
-crudini --set /etc/nova/nova.conf DEFAULT flat_interface eth0
+crudini --set /etc/nova/nova.conf DEFAULT flat_interface flat0
 crudini --set /etc/nova/nova.conf DEFAULT flat_network_bridge br100
 crudini --set /etc/nova/nova.conf DEFAULT public_interface eth0
 
diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh
index 0bc13cbdd8..53d072b3fb 100755
--- a/docker/nova-compute/nova-network/start.sh
+++ b/docker/nova-compute/nova-network/start.sh
@@ -2,9 +2,14 @@
 
 set -e
 
-. /opt/kolla/kolla-common.sh
 . /opt/kolla/config-nova.sh
 
 /usr/sbin/brctl addbr br100
+ip link set br100 up
+
+# This is a dummy interface
+ip link add flat0 type veth peer name flat1
+ip link set flat0 up
+ip link set flat1 up
 
 exec /usr/bin/nova-network