Added options to improve offline usage.
* NOVA_ZIPBALL_URL can be set for a XS/XCP install to point to a
non-standard zipball location.
* PIP_USE_MIRRORS (default True) can be set to False to stop pip
from attempting to use mirrors (useful for when using an offline
eggproxy).
Change-Id: I01a9944fe4c13c8cc8323a703f598bc498491b73
diff --git a/functions b/functions
index dbe9d30..8008500 100644
--- a/functions
+++ b/functions
@@ -7,6 +7,7 @@
# ``GLANCE_HOSTPORT``
# ``OFFLINE``
# ``PIP_DOWNLOAD_CACHE``
+# ``PIP_USE_MIRRORS``
# ``RECLONE``
# ``TRACK_DEPENDS``
# ``http_proxy``, ``https_proxy``, ``no_proxy``
@@ -578,7 +579,8 @@
# Wrapper for ``pip install`` to set cache and proxy environment variables
-# Uses globals ``OFFLINE``, ``PIP_DOWNLOAD_CACHE``, ``TRACK_DEPENDES``, ``*_proxy`
+# Uses globals ``OFFLINE``, ``PIP_DOWNLOAD_CACHE``, ``PIP_USE_MIRRORS``,
+# ``TRACK_DEPENDS``, ``*_proxy`
# pip_install package [package ...]
function pip_install {
[[ "$OFFLINE" = "True" || -z "$@" ]] && return
@@ -597,11 +599,14 @@
CMD_PIP=/usr/bin/pip-python
fi
fi
+ if [[ "$PIP_USE_MIRRORS" != "False" ]]; then
+ PIP_MIRROR_OPT="--use-mirrors"
+ fi
$SUDO_PIP PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \
NO_PROXY=$no_proxy \
- $CMD_PIP install --use-mirrors $@
+ $CMD_PIP install $PIP_MIRROR_OPT $@
}