diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-02-06 01:54:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-06 01:54:03 +0000 |
| commit | 45234f29eec45dc6a97c6a5db2a8d8a700624ab1 (patch) | |
| tree | c6f93adbf1645151670ad4ea4e7f238f922b3c20 /deploy/conf/compass.conf | |
| parent | 41006b9b6044ce732a0de3c78480d1d6db5f96e9 (diff) | |
| parent | f229198474dd5c8af9a195679c0480e154629c9b (diff) | |
Merge "Fix some hard coding for some ip assignments"
Diffstat (limited to 'deploy/conf/compass.conf')
| -rw-r--r-- | deploy/conf/compass.conf | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 33fd6200..be5d17c3 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" |