openstack/diskimage-builder
Code Issues Proposed changes

Improve local-config proxy handling.

Browse Source 
We were applying proxy settings after apt-get install runs are done
in the Ubuntu element, which made it ineffective. Secondly, we were
not applying no_proxy settings to apt, which caused it to fail in
corporate settings. More explicit control may be facilitated in future
but local-config is a DTRT tool, and so we should help it DTRT.

I think I've correctly setup Zypper for this, and I have no idea
how to make the same improvement for Yum (and also Yum currently
doesn't set HTTPS proxies, which may lead to similar reports there).

Change-Id: Idbb9781d64d44b717ea22a25429383fa45d84148
This commit is contained in:
Robert Collins 2014-02-27 08:53:45 +13:00
parent 61d474f2cd
commit 2843e8a802
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
elements/local-config/install.d/61-http-proxy → elements/local-config/pre-install.d/02-proxy-settings Executable file → Normal file
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Save the HTTP if one is available. # Save the HTTP/[S] and noproxy settings if available.
# XXX: Obviously not suitable for downloadable images. # XXX: Obviously not suitable for downloadable images.
set -e set -e
@ -20,7 +20,7 @@ if [ -n "$http_proxy" ]; then
echo export http_proxy=$http_proxy >> ~stack/.profile echo export http_proxy=$http_proxy >> ~stack/.profile
fi fi
if [ -n "$have_apt" ] ; then if [ -n "$have_apt" ] ; then
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/61-use-http-proxy echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/02-use-http-proxy
fi fi
if [ -n "$have_yum" ] ; then if [ -n "$have_yum" ] ; then
sed -i -e "s,\[main\],[main]\nproxy=$http_proxy," /etc/yum.conf sed -i -e "s,\[main\],[main]\nproxy=$http_proxy," /etc/yum.conf
@ -35,19 +35,31 @@ if [ -n "$https_proxy" ]; then
echo export https_proxy=$https_proxy >> ~stack/.profile echo export https_proxy=$https_proxy >> ~stack/.profile
fi fi
if [ -n "$have_apt" ] ; then if [ -n "$have_apt" ] ; then
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/61-use-https-proxy echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/02-use-https-proxy
fi fi
if [ -n "$have_zypper" ] ; then if [ -n "$have_zypper" ] ; then
sed -i -e "s,^HTTPS_PROXY=.*$,HTTPS_PROXY=\"$https_proxy\"," /etc/sysconfig/proxy sed -i -e "s,^HTTPS_PROXY=.*$,HTTPS_PROXY=\"$https_proxy\"," /etc/sysconfig/proxy
fi fi
fi fi
if [ -n "$http_proxy" -o -n "$https_proxy" ]; then no_proxy=${no_proxy:+"$no_proxy,192.0.2.1"}
no_proxy=${no_proxy:-"192.0.2.1"}
if [ -n "$no_proxy" ]; then
if [ -d ~stack ]; then if [ -d ~stack ]; then
echo export no_proxy=192.0.2.1 >> ~stack/.profile echo export no_proxy=$no_proxy >> ~stack/.profile
fi
if [ -n "$have_apt" ] ; then
for host in $(sed 's/,/ /g' <<<$no_proxy); do
echo "Acquire::http::Proxy::$host \"DIRECT\";" >> /etc/apt/apt.conf.d/02-no-proxy
done
fi fi
if [ -n "$have_zypper" ] ; then if [ -n "$have_zypper" ] ; then
sed -i -e "s,^PROXY_ENABLED=.*$,PROXY_ENABLED=\"yes\"," \ sed -i -e "s,^\(NO_PROXY=.*\)\"$,\1\, $no_proxy\"," /etc/sysconfig/proxy
-e "s,^\(NO_PROXY=.*\)\"$,\1\, 192.0.2.1\"," /etc/sysconfig/proxy fi
fi
if [ -n "$http_proxy" -o -n "$https_proxy" -o -n "$no_proxy" ]; then
if [ -n "$have_zypper" ] ; then
sed -i -e "s,^PROXY_ENABLED=.*$,PROXY_ENABLED=\"yes\"," /etc/sysconfig/proxy
fi fi
fi fi