Merge "consoliate set_availability_zones usage"
This commit is contained in:
commit
8ad220dd8e
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -127,8 +127,8 @@ def get_availability_zones(context, get_only_available=False,
|
|||
:param with_hosts: whether to return hosts part of the AZs
|
||||
:type with_hosts: bool
|
||||
"""
|
||||
enabled_services = objects.ServiceList.get_all(context, disabled=False)
|
||||
enabled_services = set_availability_zones(context, enabled_services)
|
||||
enabled_services = objects.ServiceList.get_all(context, disabled=False,
|
||||
set_zones=True)
|
||||
|
||||
available_zones = []
|
||||
for (zone, host) in [(service['availability_zone'], service['host'])
|
||||
|
@ -143,8 +143,8 @@ def get_availability_zones(context, get_only_available=False,
|
|||
available_zones = list(_available_zones.items())
|
||||
|
||||
if not get_only_available:
|
||||
disabled_services = objects.ServiceList.get_all(context, disabled=True)
|
||||
disabled_services = set_availability_zones(context, disabled_services)
|
||||
disabled_services = objects.ServiceList.get_all(context, disabled=True,
|
||||
set_zones=True)
|
||||
not_available_zones = []
|
||||
azs = available_zones if not with_hosts else dict(available_zones)
|
||||
zones = [(service['availability_zone'], service['host'])
|
||||
|
|
Loading…
Reference in New Issue