From 81d65f0b3d7098366234cf292595fe513b1c9b98 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Fri, 20 Mar 2015 23:39:49 +0000
Subject: [PATCH] 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 -
docs/integration-guide.md | 2 +-
tools/genenv | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh
index dd13a1208f..e756a21ffb 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 c4ca5e27e9..f26bb66d14 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
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 118728d9b7..8c828a60b2 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -43,7 +43,7 @@ all containers. This allows a simple method of ensuring every type of node
ADMIN_USER_PASSWORD=<steakfordinner> - The admin user password
ADMIN_TENANT_NAME=<admin> - tenant name
- FLAT_INTERFACE=<nova or neutron networking flat interface device name>
+ FLAT_INTERFACE=<eth1> - nova networking flat interface device name
GLANCE_API_SERVICE_HOST=<IP> - address where glance API is running>
GLANCE_DB_NAME=<glance> - DB name of glance service
GLANCE_DB_PASSWORD=<password> - <Glance DB password>
diff --git a/tools/genenv b/tools/genenv
index 6048efbf9b..c13ddf02b9 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -62,7 +62,7 @@ NOVA_KEYSTONE_PASSWORD=nova
NOVA_API_SERVICE_HOST=$HOST_IP
NOVA_EC2_SERVICE_HOST=$HOST_IP
NOVA_PUBLIC_INTERFACE=$MY_DEV
-NOVA_FLAT_INTERFACE=$MY_DEV
+NOVA_FLAT_INTERFACE=eth1
CONFIG_NETWORK=True
# Heat
--
GitLab