diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-21 15:56:42 -0400 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2014-10-21 16:05:36 -0400 |
| commit | d41b9dc5ac6b3a41a88baef9b83e9ccf4779ac2a (patch) | |
| tree | 35578dfba3feb19d75950f1df114c085d3ed1d2c /docker | |
| parent | 914dcfae88012cd762de1f5cc6183077a9dd359c (diff) | |
| download | kolla-d41b9dc5ac6b3a41a88baef9b83e9ccf4779ac2a.tar.gz kolla-d41b9dc5ac6b3a41a88baef9b83e9ccf4779ac2a.zip | |
workarounds for nova networkingversion-m1
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
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 2 | ||||
| -rwxr-xr-x | 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 56b673944..a0c121ac4 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 0bc13cbdd..53d072b3f 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 |