summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Sim <russell.sim@gmail.com>2012-02-24 13:50:34 +1100
committerRussell Sim <russell.sim@gmail.com>2012-02-24 16:16:18 +1100
commit5a080e5b46436e82472687d370c0fd72e750baf8 (patch)
tree3f7b600fa87e18602117704d6b53305c9e6bd864
parent8924ad8d6d57810d4de6ce4ce61efdccc759b066 (diff)
fix unicode triggered failure in AuthManager
* Always return a string from AuthManager._build_mc_key() * Fixes bug 938375 Change-Id: Iffceffab8ae62830202de07e3237230dab4e5a60
-rw-r--r--Authors1
-rw-r--r--nova/auth/manager.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/Authors b/Authors
index ec0e28b06..d46fe1c00 100644
--- a/Authors
+++ b/Authors
@@ -146,6 +146,7 @@ Rick Clark <rick@openstack.org>
Rick Harris <rconradharris@gmail.com>
Rob Kost <kost@isi.edu>
Russell Bryant <rbryant@redhat.com>
+Russell Sim <russell.sim@gmail.com>
Ryan Lane <rlane@wikimedia.org>
Ryan Lucio <rlucio@internap.com>
Ryu Ishimoto <ryu@midokura.jp>
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index d9e96a42c..2b67907bc 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -403,7 +403,7 @@ class AuthManager(object):
key_parts = ['rolecache', User.safe_id(user), str(role)]
if project:
key_parts.append(Project.safe_id(project))
- return '-'.join(key_parts)
+ return utils.utf8('-'.join(key_parts))
def _clear_mc_key(self, user, role, project=None):
# NOTE(anthony): it would be better to delete the key