openstack/devstack
Code Issues Proposed changes

Merge "lib/tls: use python3 to run inline script"

Browse Source
This commit is contained in:
Zuul 2020-04-22 10:39:29 +00:00 committed by Gerrit Code Review
commit 95d3d7a5fc
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