x/gantt
Code Issues Proposed changes

Merge "Make the metadata paths use conductor"

Browse Source
This commit is contained in:
Jenkins
2013-02-12 22:17:54 +00:00
committed by Gerrit Code Review
parent 59c0b805aa bbdfc56fdf
commit 60be89e5b8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/availability_zones.py
View File

@@ -52,9 +52,13 @@ def set_availability_zones(context, services):
return services
def get_host_availability_zone(context, host):
metadata = db.aggregate_metadata_get_by_host(
context, host, key='availability_zone')
def get_host_availability_zone(context, host, conductor_api=None):
if conductor_api:
metadata = conductor_api.aggregate_metadata_get_by_host(
context, host, key='availability_zone')
else:
metadata = db.aggregate_metadata_get_by_host(
context, host, key='availability_zone')
if 'availability_zone' in metadata:
return list(metadata['availability_zone'])[0]
else: