From 43cfbfd677ca529f36dd416ee2614204f6eb7687 Mon Sep 17 00:00:00 2001 From: Tom Hancock Date: Thu, 16 Jan 2014 13:27:50 +0000 Subject: [PATCH] Fixes for use behind proxy Need to use setuptools>=1.0 in order to get fixes which allow fetches of dependencies from pypi to work correctly when operating behind a proxy. Ref: https://bitbucket.org/pypa/setuptools/issue/52/ssl-errors-with-https-proxy and also some prior fixes to bug #1201253 in change id I7cca000857f7691d4cb723d0a0c22a202da703f8 Change-Id: I3f11b4b9b8d2bd59f32c5d4de5ee58f1423287f5 Fixes: bug #1201253 --- elements/openstack-clients/install.d/51-openstack-clients | 4 ++++ elements/os-collect-config/install.d/10-os-collect-config | 3 +++ elements/os-refresh-config/install.d/01-os-refresh-config | 3 +++ 3 files changed, 10 insertions(+) diff --git a/elements/openstack-clients/install.d/51-openstack-clients b/elements/openstack-clients/install.d/51-openstack-clients index 18dcd0160..aa1b145e5 100755 --- a/elements/openstack-clients/install.d/51-openstack-clients +++ b/elements/openstack-clients/install.d/51-openstack-clients @@ -21,6 +21,10 @@ for client in $client_install_list; do source /opt/stack/venvs/$repo/bin/activate set -u + # Need setuptools>=1.0 to manage connections when + # downloading from pypi using http_proxy and https_proxy + pip install -U 'setuptools>=1.0' + pushd /opt/stack/$repo if [ -e requirements.txt ]; then pip install -r requirements.txt diff --git a/elements/os-collect-config/install.d/10-os-collect-config b/elements/os-collect-config/install.d/10-os-collect-config index 945f959c1..db231e5c0 100755 --- a/elements/os-collect-config/install.d/10-os-collect-config +++ b/elements/os-collect-config/install.d/10-os-collect-config @@ -5,6 +5,9 @@ install-packages python-virtualenv build-essential libz-dev libxslt-dev libxml2- virtualenv --setuptools /opt/stack/venvs/os-collect-config +# Need setuptools>=1.0 to manage connections when +# downloading from pypi using http_proxy and https_proxy +/opt/stack/venvs/os-collect-config/bin/pip install -U 'setuptools>=1.0' /opt/stack/venvs/os-collect-config/bin/pip install -U os-collect-config ln -s /opt/stack/venvs/os-collect-config/bin/os-collect-config /usr/local/bin/os-collect-config diff --git a/elements/os-refresh-config/install.d/01-os-refresh-config b/elements/os-refresh-config/install.d/01-os-refresh-config index a73dd8207..02ee5640c 100755 --- a/elements/os-refresh-config/install.d/01-os-refresh-config +++ b/elements/os-refresh-config/install.d/01-os-refresh-config @@ -8,6 +8,9 @@ install-packages python-virtualenv virtualenv --setuptools /opt/stack/venvs/os-refresh-config +# Need setuptools>=1.0 to manage connections when +# downloading from pypi using http_proxy and https_proxy +/opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0' /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config ln -s /opt/stack/venvs/os-refresh-config/bin/os-refresh-config /usr/local/bin/os-refresh-config