List AZs fails if there are disabled services

Trying to list availability zones when there is a disabled
services fails with a 500 error

Fixes bug #1160841

Change-Id: Ibdb639f0d6a1a69a6a6331ee053c75449a16fc8f
This commit is contained in:
Phil Day
2013-03-27 12:01:01 +00:00
parent 0bf5322373
commit ea663f3627
2 changed files with 62 additions and 19 deletions

View File

@@ -80,8 +80,8 @@ def get_availability_zones(context):
available_zones.append(zone)
not_available_zones = []
zones = [service['available_zones'] for service in disabled_services
if service['available_zones'] not in available_zones]
zones = [service['availability_zone'] for service in disabled_services
if service['availability_zone'] not in available_zones]
for zone in zones:
if zone not in not_available_zones:
not_available_zones.append(zone)