openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Lars Kellogg-Stedman 2014-10-21 15:56:42 -04:00
parent 914dcfae88
commit d41b9dc5ac
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/nova-base/config-nova.sh
View File

@ -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

7
docker/nova-compute/nova-network/start.sh
View File

@ -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