openstack/devstack
Code Issues Proposed changes

Revert "Replace pip-installed requests CA bundle with link"

Browse Source 
This does not gracefully handle the situation where requests
is not there at the beginning. Needs to be rethought.

This reverts commit 7d350720fe.

Change-Id: I101fac0dc6fdc97b7fb0b2955cffc6b4905152e5
This commit is contained in:
Sean Dague 2015-06-10 10:26:57 +00:00
parent 7d350720fe
commit 7272afdf8b
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/fixup_stuff.sh
View File

@ -138,24 +138,3 @@ fi
# and installing the latest version using pip.
uninstall_package python-virtualenv
pip_install -U virtualenv
# If a non-system python-requests is installed then it will use the
# built-in CA certificate store rather than the distro-specific
# CA certificate store. Detect this and symlink to the correct
# one. If the value for the CA is not rooted in /etc then we know
# we need to change it.
capath=$(python -c "from requests import certs; print certs.where()")
if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then
if [[ ! $capath =~ ^/etc/.* && ! -L $capath ]]; then
if is_fedora; then
sudo rm -f $capath
sudo ln -s /etc/pki/tls/certs/ca-bundle.crt $capath
elif is_ubuntu; then
sudo rm -f $capath
sudo ln -s /etc/ssl/certs/ca-certificates.crt $capath
else
echo "Don't know how to set the CA bundle, expect the install to fail."
fi
fi
fi