diff options
| author |   Justin chi <chigang@huawei.com> | 2018-05-22 12:32:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-22 12:32:43 +0000 |
| commit | c9bd8b778c698a9fd39764fa0f4275614ecee5a8 (patch) | |
| tree | b576b629f0b4f8383e645ed45530802a3173e6e0 /deploy/conf | |
| parent | e0cc095b31e0285fe318863704b0916a8f88e17d (diff) | |
| parent | 7f0439ac27821dbaacda757bde56b3e53f27785c (diff) | |
Merge "enable http_proxy in kargo"
Diffstat (limited to 'deploy/conf')
| -rw-r--r-- | deploy/conf/base.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 274847ae..76eb1491 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -17,8 +17,8 @@ export EXPANSION=${EXPANSION:-"false"} export NETWORK_MAPPING=${NETWORK_MAPPING:-"install=${MANAGEMENT_INTERFACE}"} -export PROXY="" -export IGNORE_PROXY="" +export PROXY=${LOCAL_PROXY:-""} +export IGNORE_PROXY=${LOCAL_NO_PROXY:-""} export SEARCH_PATH="ods.com" export SERVER_CREDENTIAL="root=root" export LOCAL_REPO_URL="" |