diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-27 02:31:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-27 02:31:20 +0000 |
| commit | 018326260f3b039e0adfeaef0aefc9a3c2adb270 (patch) | |
| tree | 59522637b81492b343bb0caaadab85fb2ddcbc06 | |
| parent | e216883ce0d2a2cb93e661d8fa04fd6250b9771c (diff) | |
| parent | c8cb579663fb0464f4c005914567cf8f223f075f (diff) | |
| download | nova-018326260f3b039e0adfeaef0aefc9a3c2adb270.tar.gz | |
Merge "Remove unnecessary DB call to find EC2 AZs." into milestone-proposed
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 | ||||
| -rw-r--r-- | nova/api/ec2/ec2utils.py | 8 | ||||
| -rw-r--r-- | nova/api/metadata/base.py | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a35460576f..8807042dde 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1178,8 +1178,7 @@ class CloudController(object): self._format_instance_bdm(context, instance['uuid'], i['rootDeviceName'], i) host = instance['host'] - services = db.service_get_all_by_host(context.elevated(), host) - zone = ec2utils.get_availability_zone_by_host(services, host) + zone = ec2utils.get_availability_zone_by_host(host) i['placement'] = {'availabilityZone': zone} if instance['reservation_id'] not in reservations: r = {} diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index f1a7abfbc9..b49b9ff654 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -142,11 +142,9 @@ def get_ip_info_for_instance(context, instance): return get_ip_info_for_instance_from_nw_info(nw_info) -def get_availability_zone_by_host(services, host, conductor_api=None): - if len(services) > 0: - return availability_zones.get_host_availability_zone( - context.get_admin_context(), host, conductor_api) - return 'unknown zone' +def get_availability_zone_by_host(host, conductor_api=None): + return availability_zones.get_host_availability_zone( + context.get_admin_context(), host, conductor_api) def id_to_ec2_id(instance_id, template='i-%08x'): diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 896c8fbd7b..90dcb9ca56 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -106,10 +106,8 @@ class InstanceMetadata(): ctxt = context.get_admin_context() capi = self.conductor_api - services = capi.service_get_all_by_host(ctxt.elevated(), - instance['host']) self.availability_zone = ec2utils.get_availability_zone_by_host( - services, instance['host'], capi) + instance['host'], capi) self.ip_info = ec2utils.get_ip_info_for_instance(ctxt, instance) |