diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-03-20 23:39:49 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-03-24 18:44:28 +0000 |
| commit | 81d65f0b3d7098366234cf292595fe513b1c9b98 (patch) | |
| tree | 48d80e3fe5d7fa50c9ee15d4a2cecc45c0768320 /docker | |
| parent | 2dab951747e68d465894b20e1e84323779908f7d (diff) | |
| download | kolla-81d65f0b3d7098366234cf292595fe513b1c9b98.tar.gz kolla-81d65f0b3d7098366234cf292595fe513b1c9b98.zip | |
Refactor nova-network
Previously, eth0 was set as the nova flat interface. This
interface is used to bridge VM traffic between instances and
should not have an IP. It's a problem when you associate an
interface with an IP to the FLAT_INTERFACE.
Change-Id: I38c516094430e2d55b1b4c047a1bbcfe711a2dff
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 4 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/config-nova-network.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index dd13a1208..e756a21ff 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -10,8 +10,8 @@ : ${RABBIT_USERID:=guest} : ${RABBIT_PASSWORD:=guest} : ${NETWORK_MANAGER:=nova} -: ${FLAT_NETWORK:=eth0} -: ${PUBLIC_NETWORK:=eth1} +: ${FLAT_NETWORK:=eth1} +: ${PUBLIC_NETWORK:=eth0} check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh index c4ca5e27e..f26bb66d1 100755 --- a/docker/nova-compute/nova-network/config-nova-network.sh +++ b/docker/nova-compute/nova-network/config-nova-network.sh @@ -7,7 +7,6 @@ cat > /etc/sysconfig/network-scripts/ifcfg-$FLAT_INTERFACE <<EOF DEVICE="$FLAT_INTERFACE" BOOTPROTO="none" ONBOOT="yes" -DEFROUTE="yes" TYPE="Ethernet" EOF |