openstack/kolla-ansible
Code Issues Proposed changes

Improve Vagrants bootstrap.sh proxy support

Browse Source 
* sudo is not needed as script already runs as root, using sudo would
  require http_* env vars to be carried through.

* Add a systemd unit file to configure docker proxy support

* Update /etc/bashrc if available proxy

TrivialFix

Change-Id: If2571389ec3dc5bce9e819acf962d202b3166b97
This commit is contained in:
Paul Bourke 2016-04-26 17:16:27 +01:00
parent cb8e3b605e
commit d2a62c96cd
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dev/vagrant/bootstrap.sh
View File

@ -21,7 +21,8 @@ else
REGISTRY_PORT=5000 REGISTRY_PORT=5000
SUPPORT_NODE=support01 SUPPORT_NODE=support01
fi fi
REGISTRY=operator.local:${REGISTRY_PORT} REGISTRY_URL="operator.local"
REGISTRY=${REGISTRY_URL}:${REGISTRY_PORT}
ADMIN_PROTOCOL="http" ADMIN_PROTOCOL="http"
function _ensure_lsb_release { function _ensure_lsb_release {
@ -30,9 +31,9 @@ function _ensure_lsb_release {
fi fi
if [[ -x $(which apt-get 2>/dev/null) ]]; then if [[ -x $(which apt-get 2>/dev/null) ]]; then
sudo apt-get install -y lsb-release apt-get install -y lsb-release
elif [[ -x $(which yum 2>/dev/null) ]]; then elif [[ -x $(which yum 2>/dev/null) ]]; then
sudo yum -y install redhat-lsb-core yum -y install redhat-lsb-core
fi fi
} }
@ -124,6 +125,20 @@ EOF
exit 1 exit 1
fi fi
if [[ "${http_proxy}" != "" ]]; then
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}"
EOF
if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then
echo "export http_proxy=${http_proxy}" >> /etc/bashrc
echo "export https_proxy=${https_proxy}" >> /etc/bashrc
fi
fi
systemctl daemon-reload systemctl daemon-reload
systemctl enable docker systemctl enable docker
systemctl start docker systemctl start docker