diff options
| author |   valentin boucher <valentin.boucher@kontron.com> | 2018-09-19 14:09:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-19 14:09:03 +0000 |
| commit | 488d974effc817840fd8a4a332c6e9679f6b3639 (patch) | |
| tree | afc055db21a04796cee68b03b6669a203c8f5bd5 | |
| parent | 5d54a533d25a989dc64a2789788ff2f2fd6ad5c6 (diff) | |
| parent | be864b0de9f0f990984ad9e3c2d20b694e1b2c26 (diff) | |
Merge "Correct proxy configuration for VNF VM"
| -rw-r--r-- | functest/ci/add_proxy.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/functest/ci/add_proxy.sh b/functest/ci/add_proxy.sh index d19153811..3244f246a 100644 --- a/functest/ci/add_proxy.sh +++ b/functest/ci/add_proxy.sh @@ -22,6 +22,13 @@ NO_PROXY=${no_proxy:-"10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"} EOF } +add_proxy_apt () { + cat << EOF >> "$1" +Acquire::http::Proxy "${http_proxy:-http://proxy:8080}"; +Acquire::https::Proxy "${https_proxy:-http://proxy:8080}"; +EOF +} + tmpdir=$(mktemp -d) for image in $images; do if [ ! -f "$image" ]; then @@ -31,9 +38,14 @@ for image in $images; do guestmount -a "${image}" -i --rw "${tmpdir}" add_proxy "${tmpdir}/etc/environment" if [[ ${image} == *"cloudify-manager"* ]]; then + echo >> "${tmpdir}/etc/sysconfig/cloudify-mgmtworker" add_proxy "${tmpdir}/etc/sysconfig/cloudify-mgmtworker" + echo >> "${tmpdir}/etc/sysconfig/cloudify-restservice" add_proxy "${tmpdir}/etc/sysconfig/cloudify-restservice" fi + if [[ ${image} == "ubuntu"* ]]; then + add_proxy_apt "${tmpdir}/etc/apt/apt.conf" + fi guestunmount "${tmpdir}" done |