aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf/compass.conf
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-12-13 17:04:21 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-01-22 16:39:39 +0800
commitf229198474dd5c8af9a195679c0480e154629c9b (patch)
tree4ba11b91a47d23eefeb360808cf6baafa5e55183 /deploy/conf/compass.conf
parent24e25de8fc981e3b33ffaa71e76f27dedcf6b89e (diff)
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>
Diffstat (limited to 'deploy/conf/compass.conf')
-rw-r--r--deploy/conf/compass.conf8
1 files changed, 3 insertions, 5 deletions
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"