@@ -1897,6 +1897,12 @@ function maskip {

     echo $subnet

 }

+# Return the current python as "python<major>.<minor>"

+function python_version {

+    local python_version=$(python -c 'import sys; print("%s.%s" % sys.version_info[0:2])')

+    echo "python${python_version}"

+}

+

 # Service wrapper to restart services

 # restart_service service-name

 function restart_service {

@@ -164,7 +164,7 @@ function _config_keystone_apache_wsgi {

         keystone_auth_port=$KEYSTONE_AUTH_PORT_INT

     fi

     if [[ ${USE_VENV} = True ]]; then

-        venv_path="python-path=${PROJECT_VENV["keystone"]}/lib/python2.7/site-packages"

+        venv_path="python-path=${PROJECT_VENV["keystone"]}/lib/$(python_version)/site-packages"

     fi

     # copy proxy vhost and wsgi file

@@ -259,7 +259,7 @@ function _config_nova_apache_wsgi {

         nova_keyfile="SSLCertificateKeyFile $NOVA_SSL_KEY"

     fi

     if [[ ${USE_VENV} = True ]]; then

-        venv_path="python-path=${PROJECT_VENV["nova"]}/lib/python2.7/site-packages"

+        venv_path="python-path=${PROJECT_VENV["nova"]}/lib/$(python_version)/site-packages"

     fi

     # copy proxy vhost and wsgi helper files