diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-27 03:17:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-27 03:17:03 +0000 |
| commit | 92bf9dd5dc214e815b9e6251547e085470706a41 (patch) | |
| tree | 67c13d885e05549c9d2ad08bd171c95b1838c6f3 /dev | |
| parent | d0caee3d663f9c701d4781f84dd10f38b4f9d843 (diff) | |
| parent | a43a8d77a94894fa76235fd5368d01ed1191fdb4 (diff) | |
| download | kolla-92bf9dd5dc214e815b9e6251547e085470706a41.tar.gz kolla-92bf9dd5dc214e815b9e6251547e085470706a41.zip | |
Merge "Fix docker daemon proxy support in vagrant"
Diffstat (limited to 'dev')
| -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 |