diff options
author | Ruan HE <ruan.he@orange.com> | 2015-09-24 12:58:47 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-24 12:58:47 +0000 |
commit | 49325d99acfadaadfad99c596c4ada6b5ec849de (patch) | |
tree | 8aa122c4edb6f9527651e6c3abf65f416c288c85 /keystonemiddleware-moon/keystonemiddleware/s3_token.py | |
parent | 17682330bc068a964bed3ec1c5d43677c09d6d4f (diff) | |
parent | 0be7a3d4e0647dc0d94a34e4fc2f8c364de46602 (diff) |
Merge "Update code from KeystoneMiddleware Github repository (Master)."
Diffstat (limited to 'keystonemiddleware-moon/keystonemiddleware/s3_token.py')
-rw-r--r-- | keystonemiddleware-moon/keystonemiddleware/s3_token.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keystonemiddleware-moon/keystonemiddleware/s3_token.py b/keystonemiddleware-moon/keystonemiddleware/s3_token.py index d56482fd..d71ab276 100644 --- a/keystonemiddleware-moon/keystonemiddleware/s3_token.py +++ b/keystonemiddleware-moon/keystonemiddleware/s3_token.py @@ -35,6 +35,7 @@ import logging import webob from oslo_serialization import jsonutils +from oslo_utils import strutils import requests import six from six.moves import urllib @@ -116,7 +117,7 @@ class S3Token(object): auth_port) # SSL - insecure = conf.get('insecure', False) + insecure = strutils.bool_from_string(conf.get('insecure', False)) cert_file = conf.get('certfile') key_file = conf.get('keyfile') @@ -250,6 +251,8 @@ class S3Token(object): req.headers['X-Auth-Token'] = token_id tenant_to_connect = force_tenant or tenant['id'] + if six.PY2 and isinstance(tenant_to_connect, six.text_type): + tenant_to_connect = tenant_to_connect.encode('utf-8') self._logger.debug('Connecting with tenant: %s', tenant_to_connect) new_tenant_name = '%s%s' % (self._reseller_prefix, tenant_to_connect) environ['PATH_INFO'] = environ['PATH_INFO'].replace(account, |