From 9652176fb2dd8166458d625aab91d531a9496cc7 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Sat, 7 Feb 2015 19:33:56 +0300 Subject: [PATCH] enable simple region definition in config. Nova uses long format for describing regions in config - region_list=ROne=IP1,RTwo=IP2 this change enables simple definition without IP(mostly used for devstack instalation) region_list=RegionOne Change-Id: I2d2d4d111df6bb21ddc02d4341d8a9a726300e36 --- ec2api/api/availability_zone.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ec2api/api/availability_zone.py b/ec2api/api/availability_zone.py index 92faa88a..290fae35 100644 --- a/ec2api/api/availability_zone.py +++ b/ec2api/api/availability_zone.py @@ -103,6 +103,8 @@ def describe_regions(context, region_name=None, filter=None): regions = [] for region in CONF.region_list: name, _sep, host = region.partition('=') + if not host: + host = CONF.ec2_host endpoint = '%s://%s:%s%s' % (CONF.ec2_scheme, host, CONF.ec2_port,