From: Justin chi <chigang@huawei.com>
Date: Wed, 11 Oct 2017 02:39:26 +0000 (+0000)
Subject: Merge "Add customized DNS server support"
X-Git-Tag: opnfv-6.0.0~118
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d2b31ca70c3d8e49b7733401ce36114bd9f1c92c;p=compass4nfv.git

Merge "Add customized DNS server support"
---

d2b31ca70c3d8e49b7733401ce36114bd9f1c92c
diff --cc deploy/conf/compass.conf
index 2c47ac48,cc99ca59..98ba3027
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@@ -14,9 -14,8 +14,9 @@@ export COMPASS_EXTERNAL_GW=${COMPASS_EX
  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'}
  
  export COMPASS_DECK="compass4nfv/compass-deck"
  export COMPASS_TASKS="compass4nfv/compass-tasks-osa:euphrates"