From 36857e5091234940e3ac68d154c019fbd5d28af5 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 5 Apr 2011 15:58:19 -0700
Subject: remove -None for user roles

---
 nova/auth/manager.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index f2451702c..3de2ceffe 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -368,8 +368,10 @@ class AuthManager(object):
                 return True
 
     def _build_mc_key(self, user, role, project=None):
-        return str("rolecache-%s-%s-%s" % (User.safe_id(user), role,
-                (Project.safe_id(project) if project else 'None')))
+        role_key = str("rolecache-%s-%s" % (User.safe_id(user), role))
+        if project:
+            return "%s-%s" % (role_key, Project.safe_id(project))
+        return role_key
 
     def _clear_mc_key(self, user, role, project=None):
         # NOTE(anthony): it would be better to delete the key
-- 
cgit