Merge "Fix operation on clouds with availability-zones"
This commit is contained in:
commit
87f5da02c3
openstackclient
@ -110,13 +110,13 @@ class ClientManager(object):
|
||||
|
||||
return
|
||||
|
||||
def get_endpoint_for_service_type(self, service_type):
|
||||
def get_endpoint_for_service_type(self, service_type, region_name=None):
|
||||
"""Return the endpoint URL for the service type."""
|
||||
# See if we are using password flow auth, i.e. we have a
|
||||
# service catalog to select endpoints from
|
||||
if self._service_catalog:
|
||||
endpoint = self._service_catalog.url_for(
|
||||
service_type=service_type)
|
||||
service_type=service_type, region_name=region_name)
|
||||
else:
|
||||
# Hope we were given the correct URL.
|
||||
endpoint = self._auth_url or self._url
|
||||
|
@ -68,7 +68,7 @@ def make_client(instance):
|
||||
else:
|
||||
# password flow
|
||||
client.client.management_url = instance.get_endpoint_for_service_type(
|
||||
API_NAME)
|
||||
API_NAME, region_name=instance._region_name)
|
||||
client.client.service_catalog = instance._service_catalog
|
||||
client.client.auth_token = instance._token
|
||||
return client
|
||||
|
@ -35,7 +35,8 @@ def make_client(instance):
|
||||
LOG.debug('Instantiating network client: %s', network_client)
|
||||
|
||||
if not instance._url:
|
||||
instance._url = instance.get_endpoint_for_service_type("network")
|
||||
instance._url = instance.get_endpoint_for_service_type(
|
||||
"network", region_name=instance._region_name)
|
||||
return network_client(
|
||||
username=instance._username,
|
||||
tenant_name=instance._project_name,
|
||||
|
@ -68,7 +68,7 @@ def make_client(instance):
|
||||
else:
|
||||
# password flow
|
||||
client.client.management_url = instance.get_endpoint_for_service_type(
|
||||
API_NAME)
|
||||
API_NAME, region_name=instance._region_name)
|
||||
client.client.service_catalog = instance._service_catalog
|
||||
client.client.auth_token = instance._token
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user