diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-22 18:00:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-22 18:00:49 +0000 |
| commit | 995d6ae7e555652b1159f847f7a06b93ffd78d05 (patch) | |
| tree | f830417dc16569514ea3f945a1853538254050c2 /nova/api | |
| parent | 2a284ea97b4c778e15916a7544395cafa761ec89 (diff) | |
| parent | 6d5e0fd2d488329f66f31a4d6a1153a4a64ed6aa (diff) | |
Merge "Fix incorrect use of context object"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/ec2utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 1ce880de4..bc47b3e0d 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -117,7 +117,8 @@ def get_ip_info_for_instance(context, instance): def get_availability_zone_by_host(services, host): if len(services) > 0: - return availability_zones.get_host_availability_zone(context, host) + return availability_zones.get_host_availability_zone( + context.get_admin_context(), host) return 'unknown zone' |