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 <huangxiangyu5@huawei.com>

4 files changed, 9 insertions, 15 deletions

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 5395405d..274847ae 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -2,17 +2,10 @@ export DHA=${DHA:-$COMPASS_DIR/deploy/conf/vm_environment/os-nosdn-nofeature-ha.
 export NEUTRON=${NEUTRON:-$COMPASS_DIR/deploy/conf/neutron_cfg.yaml}
 export NETWORK=${NETWORK:-$COMPASS_DIR/deploy/conf/network_cfg.yaml}
 export TAR_URL=${TAR_URL:-file://`pwd`/work/building/compass.tar.gz}
-export INSTALL_IP=${INSTALL_IP:-10.1.0.1}
-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 EXTERNAL_NIC=${EXTERNAL_NIC:-eth0}
+export PXE_NIC=${PXE_NIC:-eth0}
 export DOMAIN="ods.com"
 export PARTITIONS="/=30%,/home=5%,/tmp=5%,/var=60%"
-export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
 
-export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'}
 export MANAGEMENT_INTERFACE=${MANAGEMENT_INTERFACE:-eth0}
 export DASHBOARD_URL=""
 export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"}
@@ -27,7 +20,6 @@ export NETWORK_MAPPING=${NETWORK_MAPPING:-"install=${MANAGEMENT_INTERFACE}"}
 export PROXY=""
 export IGNORE_PROXY=""
 export SEARCH_PATH="ods.com"
-export GATEWAY="10.1.0.1"
 export SERVER_CREDENTIAL="root=root"
 export LOCAL_REPO_URL=""
 export OS_CONFIG_FILENAME=""
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 750ff113..c7a708b9 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -30,4 +30,3 @@ if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
 fi
 
 export DEFAULT_ROLES=""
-export VIP="10.1.0.222"
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 9d9145f1..bccc64d4 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -1,16 +1,14 @@
-export COMPASS_VIRT_CPUS=4
-export COMPASS_VIRT_MEM=4096
+export CLUSTER_NAME=${CLUSTER_NAME:-opnfv}
+export INSTALL_IP=${INSTALL_IP:-$INSTALL_GW}
 export COMPASS_SERVER=$INSTALL_IP
 export COMPASS_DECK_PORT="5050"
 export COMPASS_SERVER_URL="http://$INSTALL_IP:$COMPASS_DECK_PORT/api"
 export HTTP_SERVER_URL="http://$INSTALL_IP:$COMPASS_DECK_PORT/api"
 export COMPASS_USER_EMAIL="admin@huawei.com"
 export COMPASS_USER_PASSWORD="admin"
+
 export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'}
 export COMPASS_DNS2=${COMPASS_DNS2:-}
-export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-}
-export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-}
-export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-}
 export LANGUAGE="EN"
 export TIMEZONE="America/Los_Angeles"
 export NTP_SERVER="$COMPASS_SERVER"
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"