openstack/devstack
Code Issues Proposed changes

support no_proxy environment variable

Browse Source 
Change-Id: I5175f9752abe358cca0d2e3e5cf6d94605df451a
This commit is contained in:
Osamu Habuka 2012-07-25 12:39:32 +09:00
parent 14ab37eb41
commit 7abe4f24a3
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -29,6 +29,7 @@ Josh Kearney <josh@jk0.org>
Justin Shepherd <galstrom21@gmail.com> Justin Shepherd <galstrom21@gmail.com>
Ken Pepple <ken.pepple@rabbityard.com> Ken Pepple <ken.pepple@rabbityard.com>
Kiall Mac Innes <kiall@managedit.ie> Kiall Mac Innes <kiall@managedit.ie>
Osamu Habuka <xiu.yushen@gmail.com>
Russell Bryant <rbryant@redhat.com> Russell Bryant <rbryant@redhat.com>
Scott Moser <smoser@ubuntu.com> Scott Moser <smoser@ubuntu.com>
Thierry Carrez <thierry@openstack.org> Thierry Carrez <thierry@openstack.org>

4
functions
View File

@ -17,6 +17,7 @@ function apt_get() {
[[ "$(id -u)" = "0" ]] && sudo="env" [[ "$(id -u)" = "0" ]] && sudo="env"
$sudo DEBIAN_FRONTEND=noninteractive \ $sudo DEBIAN_FRONTEND=noninteractive \
http_proxy=$http_proxy https_proxy=$https_proxy \ http_proxy=$http_proxy https_proxy=$https_proxy \
no_proxy=$no_proxy \
apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@" apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
} }
@ -479,6 +480,7 @@ function pip_install {
sudo PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \ sudo PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
HTTP_PROXY=$http_proxy \ HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \ HTTPS_PROXY=$https_proxy \
NO_PROXY=$no_proxy \
$CMD_PIP install --use-mirrors $@ $CMD_PIP install --use-mirrors $@
} }
@ -509,6 +511,7 @@ function setup_develop() {
sudo \ sudo \
HTTP_PROXY=$http_proxy \ HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \ HTTPS_PROXY=$https_proxy \
NO_PROXY=$no_proxy \
python setup.py develop \ python setup.py develop \
) )
} }
@ -562,6 +565,7 @@ function yum_install() {
local sudo="sudo" local sudo="sudo"
[[ "$(id -u)" = "0" ]] && sudo="env" [[ "$(id -u)" = "0" ]] && sudo="env"
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \ $sudo http_proxy=$http_proxy https_proxy=$https_proxy \
no_proxy=$no_proxy \
yum install -y "$@" yum install -y "$@"
} }

9
stack.sh
View File

@ -60,16 +60,21 @@ fi
source $TOP_DIR/stackrc source $TOP_DIR/stackrc
# HTTP and HTTPS proxy servers are supported via the usual environment variables # HTTP and HTTPS proxy servers are supported via the usual environment variables
# ``http_proxy`` and ``https_proxy``. They can be set in ``localrc`` if necessary # ``http_proxy`` and ``https_proxy``. Additionally if you would like to access
# to specific server directly and not through the proxy server, you can use
# ``no_proxy`` environment variable. They can be set in ``localrc`` if necessary
# or on the command line:: # or on the command line::
# #
# http_proxy=http://proxy.example.com:3128/ ./stack.sh # http_proxy=http://proxy.example.com:3128/ no_proxy=repo.example.net ./stack.sh
if [[ -n "$http_proxy" ]]; then if [[ -n "$http_proxy" ]]; then
export http_proxy=$http_proxy export http_proxy=$http_proxy
fi fi
if [[ -n "$https_proxy" ]]; then if [[ -n "$https_proxy" ]]; then
export https_proxy=$https_proxy export https_proxy=$https_proxy
fi fi
if [[ -n "$no_proxy" ]]; then
export no_proxy=$no_proxy
fi
# Destination path for installation ``DEST`` # Destination path for installation ``DEST``
DEST=${DEST:-/opt/stack} DEST=${DEST:-/opt/stack}