diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2012-06-29 21:32:08 -0600 |
|---|---|---|
| committer | John Griffith <john.griffith@solidfire.com> | 2012-07-02 20:00:32 -0600 |
| commit | 94a34e0e69a520e403a2d8e579186fad9acf14c7 (patch) | |
| tree | 62687aea6ca8ee127a1dcc4e7495d9ea60168ac3 /nova/context.py | |
| parent | 2038e933bd8bde659e31b4a78e2211a585e3dcec (diff) | |
| download | nova-94a34e0e69a520e403a2d8e579186fad9acf14c7.tar.gz nova-94a34e0e69a520e403a2d8e579186fad9acf14c7.tar.xz nova-94a34e0e69a520e403a2d8e579186fad9acf14c7.zip | |
Add ServiceCatalog entries to enable Cinder usage
* Part of of blueprint extract-nova-volumes
* Adds usage of service catalog to ec2
* Adds entries to auth.py
* Implements tests for new authorization mods
Change-Id: I2efb375bbb130cde6a1ba119fa862ca45b126a1e
Diffstat (limited to 'nova/context.py')
| -rw-r--r-- | nova/context.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/context.py b/nova/context.py index f2bb6b5d6..cb957caf7 100644 --- a/nova/context.py +++ b/nova/context.py @@ -45,7 +45,7 @@ class RequestContext(object): roles=None, remote_address=None, timestamp=None, request_id=None, auth_token=None, overwrite=True, quota_class=None, user_name=None, project_name=None, - **kwargs): + service_catalog=None, **kwargs): """ :param read_deleted: 'no' indicates deleted records are hidden, 'yes' indicates deleted records are visible, 'only' indicates that @@ -80,6 +80,7 @@ class RequestContext(object): request_id = generate_request_id() self.request_id = request_id self.auth_token = auth_token + self.service_catalog = service_catalog # NOTE(markmc): this attribute is currently only used by the # rs_limits turnstile pre-processor. @@ -121,6 +122,7 @@ class RequestContext(object): 'auth_token': self.auth_token, 'quota_class': self.quota_class, 'user_name': self.user_name, + 'service_catalog': self.service_catalog, 'project_name': self.project_name} @classmethod |