change default region
Change-Id: Iaac041a9c24b09235c05fe452322f2bb475b290f
This commit is contained in:
parent
4eb28b5f88
commit
91bbf449e2
|
@ -120,7 +120,9 @@ def describe_regions(context, region_name=None, filter=None):
|
||||||
regions.append({'regionName': name,
|
regions.append({'regionName': name,
|
||||||
'regionEndpoint': endpoint})
|
'regionEndpoint': endpoint})
|
||||||
else:
|
else:
|
||||||
regions = [{'regionName': 'nova',
|
# NOTE(andrey-mp): RegionOne is a default region name that is used
|
||||||
|
# in keystone, nova and some other projects
|
||||||
|
regions = [{'regionName': 'RegionOne',
|
||||||
'regionEndpoint': '%s://%s:%s%s' % (CONF.ec2_scheme,
|
'regionEndpoint': '%s://%s:%s%s' % (CONF.ec2_scheme,
|
||||||
CONF.ec2_host,
|
CONF.ec2_host,
|
||||||
CONF.ec2_port,
|
CONF.ec2_port,
|
||||||
|
|
|
@ -20,7 +20,7 @@ from oslo_config import types
|
||||||
def _get_client(client_name, url, region, access, secret, ca_bundle):
|
def _get_client(client_name, url, region, access, secret, ca_bundle):
|
||||||
connection_data = {
|
connection_data = {
|
||||||
'config_file': (None, 'AWS_CONFIG_FILE', None, None),
|
'config_file': (None, 'AWS_CONFIG_FILE', None, None),
|
||||||
'region': ('region', 'BOTO_DEFAULT_REGION', region, None),
|
'region': ('region', 'AWS_DEFAULT_REGION', region, None),
|
||||||
}
|
}
|
||||||
session = botocore.session.get_session(connection_data)
|
session = botocore.session.get_session(connection_data)
|
||||||
kwargs = {
|
kwargs = {
|
||||||
|
|
|
@ -56,7 +56,7 @@ class AvailabilityZoneCase(base.ApiTestCase):
|
||||||
|
|
||||||
def test_regions(self):
|
def test_regions(self):
|
||||||
resp = self.execute('DescribeRegions', {})
|
resp = self.execute('DescribeRegions', {})
|
||||||
self.assertEqual(resp['regionInfo'][0]['regionName'], 'nova')
|
self.assertEqual(resp['regionInfo'][0]['regionName'], 'RegionOne')
|
||||||
self.assertTrue(resp['regionInfo'][0].get('regionEndpoint')
|
self.assertTrue(resp['regionInfo'][0].get('regionEndpoint')
|
||||||
is not None)
|
is not None)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue