openstack/devstack
Code Issues Proposed changes

lib/tls: use python3 to run inline script

Browse Source 
We only need to run this fixup for the active python now we are 3 only.

Change-Id: I7616e5ee5693b2890fb7f6bd9052890a82904c22
This commit is contained in:
Ian Wienand 2020-04-16 13:06:07 +10:00
parent ef4e75137d
commit 3cd41019b0
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tls
View File

@ -369,8 +369,7 @@ function deploy_int_CA {
function fix_system_ca_bundle_path {
if is_service_enabled tls-proxy; then
local capath
local python_cmd=${1:-python}
capath=$($python_cmd -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
capath=$(python3 -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
if [[ ! $capath == "" && ! $capath =~ ^/etc/.* && ! -L $capath ]]; then
if is_fedora; then

3
stack.sh
View File

@ -968,9 +968,6 @@ fi
if is_service_enabled tls-proxy; then
fix_system_ca_bundle_path
if python3_enabled ; then
fix_system_ca_bundle_path python3
fi
fi
# Extras Install