Code Review
/
compass4nfv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
combined
(merge:
c5127c4
7b110b3
)
Merge "Add customized DNS server support"
author
Justin chi
<chigang@huawei.com>
Wed, 11 Oct 2017 02:39:26 +0000
(
02:39
+0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Wed, 11 Oct 2017 02:39:26 +0000
(
02:39
+0000)
1
2
deploy/conf/compass.conf
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
deploy/conf/compass.conf
index
2c47ac4
,
cc99ca5
..
98ba302
---
1
/
deploy/conf/compass.conf
---
2
/
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"