X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nsb_setup.sh;h=50fc017d16545a4ef67d37c0e48b2cf27d6bc600;hb=74e4fccdd6d69e352e75279b5f8f757323af8047;hp=cb44839afc5f97d0ccba608808dbc43880fcefc9;hpb=92098cdeb1d0d21ceea33f4f234d7b383ab46f14;p=yardstick.git diff --git a/nsb_setup.sh b/nsb_setup.sh index cb44839af..50fc017d1 100755 --- a/nsb_setup.sh +++ b/nsb_setup.sh @@ -42,6 +42,16 @@ proxy_env: https_proxy: ${https_proxy} no_proxy: ${no_proxy} EOF + + mkdir -p /etc/systemd/system/docker.service.d + cat < /etc/systemd/system/docker.service.d/http-proxy.conf +--- +[Service] +Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=${no_proxy}" +EOF + + systemctl daemon-reload + systemctl restart docker fi apt-get update > /dev/null 2>&1 @@ -53,7 +63,7 @@ for i in "${pkg[@]}"; do fi done -pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6 +pip install ansible==2.4.2 shade==1.22.2 docker-py==1.10.6 ANSIBLE_SCRIPTS="ansible"