diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2012-05-09 17:15:43 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2012-05-10 13:54:58 -0500 |
| commit | 6fb1a4e496f6860c800f08e68c05b7e95be36c3b (patch) | |
| tree | f109c8da9544b54f59313006f4c219e10bd8ff8f /openstackclient/compute | |
| parent | a7da2b8008c7429eab270aa937f563dfa3353afa (diff) | |
| download | python-openstackclient-6fb1a4e496f6860c800f08e68c05b7e95be36c3b.tar.gz | |
More identity client config
* move auth option checking back to OpenStackShell() to keep the shell-level
interaction at that level; add checking for token flow options
* make identity.client.make_client() configure keystoneclient.v2_0.Client()
properly for both password flow and token flow auth
* eliminated ClientManager.init_token(), set _service_catalog in __init__()
* compute client handles token flow
Change-Id: I42481b5424489387798c4ec6d3e2a723ab1e6067
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 |