openstack/kolla-ansible
Code Issues Proposed changes

Fix docker daemon proxy support in vagrant

Browse Source 
There was an unwanted line break in the systemd file preventing the proxy from
being configured correctly.

TrivialFix

Change-Id: I3e6413d4f2d373951cb558e0af1b8bc92d4cbb91
This commit is contained in:
Paul Bourke 2016-06-23 14:21:10 +01:00
parent d1be7fdb65
commit a43a8d77a9
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