aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-11 07:50:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-11 07:50:53 +0000
commit48062f3c669497ec825772d32678c8b122e88ced (patch)
treebe7be22af30ef69737e13c5f915e9b82dbba7121
parent008f9314cbea65cc6a72302d1307876e5137b2ff (diff)
parent86eb75c8201504316e2b1cd3ad5df21e54fd2171 (diff)
Merge "Add customized DNS server support" into stable/euphrates
-rw-r--r--deploy/conf/compass.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 2c47ac4..98ba302 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -14,7 +14,7 @@ export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-}
export LANGUAGE="EN"
export TIMEZONE="America/Los_Angeles"
export NTP_SERVER="$COMPASS_SERVER"
-export NAMESERVERS="$COMPASS_SERVER"
+export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
export COMPASS_REPO_PORT="5151"
export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}