diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-06-23 14:21:10 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-06-23 11:40:08 +0100 |
| commit | a43a8d77a94894fa76235fd5368d01ed1191fdb4 (patch) | |
| tree | 749e5dcd1fd20f67a297c547d7592c74f6b1fcc0 /dev/vagrant/bootstrap.sh | |
| parent | d1be7fdb650868675b895fdb2fb1e14d9cc0092e (diff) | |
| download | kolla-a43a8d77a94894fa76235fd5368d01ed1191fdb4.tar.gz kolla-a43a8d77a94894fa76235fd5368d01ed1191fdb4.zip | |
Fix docker daemon proxy support in vagrant
There was an unwanted line break in the systemd file preventing the proxy from
being configured correctly.
TrivialFix
Change-Id: I3e6413d4f2d373951cb558e0af1b8bc92d4cbb91
Diffstat (limited to 'dev/vagrant/bootstrap.sh')
| -rw-r--r-- | dev/vagrant/bootstrap.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index 1d6116bac..6ae1727ac 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -127,8 +127,7 @@ EOF mkdir -p /etc/systemd/system/docker.service.d cat >/etc/systemd/system/docker.service.d/http-proxy.conf <<-EOF [Service] -Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" -"NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}" +Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}" EOF if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then |