From 81d65f0b3d7098366234cf292595fe513b1c9b98 Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Fri, 20 Mar 2015 23:39:49 +0000 Subject: 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 --- docker/nova-base/config-nova.sh | 4 ++-- docker/nova-compute/nova-network/config-nova-network.sh | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'docker') 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 <