commit a718b5ea9227ff55ca52dcd156f06b43fe2e3ca3
author Jenkins <jenkins@review.openstack.org> Wed May 31 19:59:59 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 31 19:59:59 2017 +0000
tree b4c9cedd0381b14b478b27673a1a1189604b1b5c
parent 86f9bc7b0b227925fffdc0a46c61e793d39ee482
parent 4baac6572573945f49b3b3df7b7ea27f15955477

Merge "Use proper python when configuring certs"

lib/tls

diff --git a/lib/tls b/lib/tls
index 7c6b967..65c2cba 100644
--- a/lib/tls
+++ b/lib/tls
@@ -345,7 +345,8 @@
 function fix_system_ca_bundle_path {
     if is_service_enabled tls-proxy; then
         local capath
-        capath=$(python -c $'try:\n from requests import certs\n print certs.where()\nexcept ImportError: pass')
+        local python_cmd=${1:-python}
+        capath=$($python_cmd -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

stack.sh

diff --git a/stack.sh b/stack.sh
index a016370..048acf8 100755
--- a/stack.sh
+++ b/stack.sh
@@ -894,6 +894,9 @@
 
 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