openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix docker daemon proxy support in vagrant"

Browse Source
This commit is contained in:
Jenkins 2016-06-27 03:17:02 +00:00 committed by Gerrit Code Review
commit 92bf9dd5dc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/vagrant/bootstrap.sh
View File

@ -127,8 +127,7 @@ EOF
mkdir -p /etc/systemd/system/docker.service.d mkdir -p /etc/systemd/system/docker.service.d
cat >/etc/systemd/system/docker.service.d/http-proxy.conf <<-EOF cat >/etc/systemd/system/docker.service.d/http-proxy.conf <<-EOF
[Service] [Service]
Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}"
"NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}"
EOF EOF
if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then