Merge "Add customized DNS server support"
authorJustin chi <chigang@huawei.com>
Wed, 11 Oct 2017 02:39:26 +0000 (02:39 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 11 Oct 2017 02:39:26 +0000 (02:39 +0000)
1  2 
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"