diff options
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/client.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py index 07f69aa1..30a724e0 100644 --- a/openstackclient/compute/client.py +++ b/openstackclient/compute/client.py @@ -28,8 +28,13 @@ def make_client(instance): ) # Populate the Nova client to skip another auth query to Identity - client.client.management_url = instance.get_endpoint_for_service_type( - 'compute') - client.client.service_catalog = instance._service_catalog + if instance._url: + # token flow + client.client.management_url = instance._url + else: + # password flow + client.client.management_url = instance.get_endpoint_for_service_type( + 'compute') + client.client.service_catalog = instance._service_catalog client.client.auth_token = instance._token return client |