diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-21 15:25:42 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-21 15:25:42 -0800 |
| commit | 80914923d51e65f0e7ff1d0b97797ff8b2ee74af (patch) | |
| tree | b925eaeddb96e7908661db57bb9df0857dd2c762 /nova/volume | |
| parent | f66840390bf6f4660a091663d306417e760735bc (diff) | |
| parent | 1f4bf71dfbe742c95584ff3a357076b7ea736d11 (diff) | |
Merged with head
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/volume/api.py b/nova/volume/api.py index 478c83486..2f4494845 100644 --- a/nova/volume/api.py +++ b/nova/volume/api.py @@ -49,7 +49,7 @@ class API(base.Base): options = { 'size': size, - 'user_id': context.user.id, + 'user_id': context.user_id, 'project_id': context.project_id, 'availability_zone': FLAGS.storage_availability_zone, 'status': "creating", @@ -85,7 +85,7 @@ class API(base.Base): return self.db.volume_get(context, volume_id) def get_all(self, context): - if context.user.is_admin(): + if context.is_admin: return self.db.volume_get_all(context) return self.db.volume_get_all_by_project(context, context.project_id) |