From 5db4ccd9c8a52316a83d3cdf7ba3bb83e3b66081 Mon Sep 17 00:00:00 2001
From: Russell Sim <russell.sim@gmail.com>
Date: Fri, 24 Feb 2012 13:50:34 +1100
Subject: [PATCH] fix unicode triggered failure in AuthManager

* Always return a string from AuthManager._build_mc_key()
* Fixes bug 938375

Change-Id: Iffceffab8ae62830202de07e3237230dab4e5a60
---
 Authors              | 1 +
 nova/auth/manager.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Authors b/Authors
index ec0e28b0..d46fe1c0 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 d9e96a42..2b67907b 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