diff -Nru keystone-1.0~d4~20110930.1213/debian/changelog keystone-1.0~d4~20111006.1214/debian/changelog
--- keystone-1.0~d4~20110930.1213/debian/changelog	2011-09-30 22:47:30.000000000 +0000
+++ keystone-1.0~d4~20111006.1214/debian/changelog	2011-10-06 14:47:46.000000000 +0000
@@ -1,8 +1,8 @@
-keystone (1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1) oneiric; urgency=low
+keystone (1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1) oneiric; urgency=low
 
   * Automated PPA build. Packaging revision: 20.
 
- -- Soren Hansen <soren@openstack.org>  Fri, 30 Sep 2011 22:47:30 +0000
+ -- Soren Hansen <soren@openstack.org>  Thu, 06 Oct 2011 14:47:46 +0000
 
 keystone (1.0~d4~20110909.1108-0ubuntu2) oneiric; urgency=low
 
diff -Nru keystone-1.0~d4~20110930.1213/debian/patches/debian-changes-1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1 keystone-1.0~d4~20111006.1214/debian/patches/debian-changes-1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1
--- keystone-1.0~d4~20110930.1213/debian/patches/debian-changes-1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1	2011-09-30 22:47:32.000000000 +0000
+++ keystone-1.0~d4~20111006.1214/debian/patches/debian-changes-1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Description: Upstream changes introduced in version 1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- keystone (1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1) oneiric; urgency=low
- .
-   * Automated PPA build. Packaging revision: 20.
- .
- The person named in the Author field signed this changelog entry.
-Author: Soren Hansen <soren@openstack.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ keystone-1.0~d4~20110930.1213/.bzr-builddeb/default.conf
-@@ -0,0 +1,2 @@
-+[BUILDDEB]
-+merge = True
diff -Nru keystone-1.0~d4~20110930.1213/debian/patches/debian-changes-1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1 keystone-1.0~d4~20111006.1214/debian/patches/debian-changes-1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1
--- keystone-1.0~d4~20110930.1213/debian/patches/debian-changes-1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1	1970-01-01 00:00:00.000000000 +0000
+++ keystone-1.0~d4~20111006.1214/debian/patches/debian-changes-1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1	2011-10-06 14:47:49.000000000 +0000
@@ -0,0 +1,30 @@
+Description: Upstream changes introduced in version 1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ keystone (1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1) oneiric; urgency=low
+ .
+   * Automated PPA build. Packaging revision: 20.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Soren Hansen <soren@openstack.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ keystone-1.0~d4~20111006.1214/.bzr-builddeb/default.conf
+@@ -0,0 +1,2 @@
++[BUILDDEB]
++merge = True
diff -Nru keystone-1.0~d4~20110930.1213/debian/patches/series keystone-1.0~d4~20111006.1214/debian/patches/series
--- keystone-1.0~d4~20110930.1213/debian/patches/series	2011-09-30 22:47:32.000000000 +0000
+++ keystone-1.0~d4~20111006.1214/debian/patches/series	2011-10-06 14:47:49.000000000 +0000
@@ -1 +1 @@
-debian-changes-1.0~d4~20110930.1213-0ubuntu0ppa1~oneiric1
+debian-changes-1.0~d4~20111006.1214-0ubuntu0ppa1~oneiric1
diff -Nru keystone-1.0~d4~20110930.1213/keystone/middleware/swift_auth.py keystone-1.0~d4~20111006.1214/keystone/middleware/swift_auth.py
--- keystone-1.0~d4~20110930.1213/keystone/middleware/swift_auth.py	2011-09-30 22:45:49.000000000 +0000
+++ keystone-1.0~d4~20111006.1214/keystone/middleware/swift_auth.py	2011-10-06 14:46:05.000000000 +0000
@@ -46,7 +46,7 @@
 from keystone.common.bufferedhttp import http_connect_raw as http_connect
 
 from swift.common.middleware.acl import clean_acl, parse_acl, referrer_allowed
-from swift.common.utils import cache_from_env, get_logger, split_path
+from swift.common.utils import get_logger, split_path
 
 
 PROTOCOL_NAME = "Swift Token Authentication"
@@ -213,9 +213,10 @@
         identity_info = json.loads(data)
         roles = []
         role_refs = identity_info["access"]["user"]["roles"]
+
         if role_refs is not None:
             for role_ref in role_refs:
-                roles.append(role_ref["roleId"])
+                roles.append(role_ref["id"])
 
         try:
             tenant = identity_info['access']['token']['tenantId']