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 < - The admin user password ADMIN_TENANT_NAME= - tenant name - FLAT_INTERFACE= + FLAT_INTERFACE= - nova networking flat interface device name GLANCE_API_SERVICE_HOST= - address where glance API is running> GLANCE_DB_NAME= - DB name of glance service 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