From f229198474dd5c8af9a195679c0480e154629c9b Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 13 Dec 2017 17:04:21 +0800 Subject: Fix some hard coding for some ip assignments JIRA: COMPASS-570 1. fix hard coding in ip assignments for install network. support full ip assignments from network.yml 2. remove some used config item in deploy/conf Change-Id: I566b74f4a55e6b96af3ee9f41d1e183a73424a91 Signed-off-by: Harry Huang --- deploy/conf/virtual.conf | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'deploy/conf/virtual.conf') diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index 1e9034f3..9661e199 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -3,6 +3,11 @@ export VIRT_CPUS=${VIRT_CPUS:-8} export VIRT_MEM=${VIRT_MEM:-16384} export VIRT_DISK=${VIRT_DISK:-200G} +export EXT_NAT_MASK=${EXT_NAT_MASK:-255.255.252.0} +export EXT_NAT_GW=${EXT_NAT_GW:-192.16.1.1} +export EXT_NAT_IP_START=${EXT_NAT_IP_START:-192.16.1.3} +export EXT_NAT_IP_END=${EXT_NAT_IP_END:-192.16.1.254} + export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" export DEPLOYMENT_TIMEOUT="300" -- cgit 1.2.3-korg