From e3f20e245517ccbdbc6512918a355831c208bbcd Mon Sep 17 00:00:00 2001 From: Ronald Bradford Date: Thu, 25 Feb 2016 19:35:04 +0000 Subject: [PATCH] Define context.roles with base class In Ia575ba803a0fb70f39146bd75d381ed19414bd23, oslo.context (2.2.0) added roles support in the context itself. This passing roles as to super()__init__. Change-Id: I22bf58dcbb5955eef7b37e76b909211f972c71ee --- manila/context.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manila/context.py b/manila/context.py index b20f907a54..e1711c0133 100644 --- a/manila/context.py +++ b/manila/context.py @@ -65,11 +65,11 @@ class RequestContext(context.RequestContext): tenant=project_id or tenant, is_admin=is_admin, request_id=request_id, - overwrite=overwrite) + overwrite=overwrite, + roles=roles) self.user_id = self.user self.project_id = self.tenant - self.roles = roles or [] if self.is_admin is None: self.is_admin = policy.check_is_admin(self.roles) @@ -111,7 +111,6 @@ class RequestContext(context.RequestContext): 'user_id': self.user_id, 'project_id': self.project_id, 'read_deleted': self.read_deleted, - 'roles': self.roles, 'remote_address': self.remote_address, 'timestamp': self.timestamp.isoformat(), 'quota_class': self.quota_class,