diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index dd13a1208f5e7c310083526f24d54a178f37302d..e756a21ffb6686775e01e532e1445f63bfd1685e 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 c4ca5e27e9bc981287b8ef18039975f0f7d9ce16..f26bb66d14ffd082086d35e467ce81a73205ad90 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 118728d9b743f9c14aace0994fb5365bad066b36..8c828a60b277a7625dede2caf611ae9502f0822a 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 6048efbf9b5844cd4c59d95cc3799d94dcd593b4..c13ddf02b99cb6aeeffb111b59dc752e6c953a49 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