openstack/nova
Code Issues Proposed changes

Merge "consoliate set_availability_zones usage"

Browse Source
This commit is contained in:
Jenkins
2015-03-23 06:52:46 +00:00
committed by Gerrit Code Review
parent c550ad253e 3a915e37dc
commit 8ad220dd8e
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/compute/contrib/availability_zone.py
View File

@@ -65,9 +65,8 @@ class AvailabilityZoneController(wsgi.Controller):
availability_zones.get_availability_zones(ctxt)
# Available services
enabled_services = objects.ServiceList.get_all(context, disabled=False)
enabled_services = availability_zones.set_availability_zones(context,
enabled_services)
enabled_services = objects.ServiceList.get_all(context, disabled=False,
set_zones=True)
zone_hosts = {}
host_services = {}
for service in enabled_services:

5
nova/api/openstack/compute/plugins/v3/availability_zone.py
View File

@@ -63,9 +63,8 @@ class AvailabilityZoneController(wsgi.Controller):
availability_zones.get_availability_zones(ctxt)
# Available services
enabled_services = objects.ServiceList.get_all(context, disabled=False)
enabled_services = availability_zones.set_availability_zones(context,
enabled_services)
enabled_services = objects.ServiceList.get_all(context, disabled=False,
set_zones=True)
zone_hosts = {}
host_services = {}
for service in enabled_services: