diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-04 00:44:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-04 00:44:51 +0000 |
| commit | 7f59fa594359376caf9a8490e45cd4f8bb0ead55 (patch) | |
| tree | 3cbe3266d797b818d8fab9c438bcdcbc38f5a942 /openstackclient/common/clientmanager.py | |
| parent | e43c0f2b9b8b1e75959179646c212fdaf3d00265 (diff) | |
| parent | 5672c688d1cc7cdc064510daa6251d39edbf3033 (diff) | |
| download | python-openstackclient-7f59fa594359376caf9a8490e45cd4f8bb0ead55.tar.gz | |
Merge "trust authentication"
Diffstat (limited to 'openstackclient/common/clientmanager.py')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 353a0a19..b310f3ac 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -48,7 +48,8 @@ class ClientManager(object): username=None, password=None, user_domain_id=None, user_domain_name=None, project_domain_id=None, project_domain_name=None, - region_name=None, api_version=None, verify=True): + region_name=None, api_version=None, verify=True, + trust_id=None): self._token = token self._url = url self._auth_url = auth_url @@ -64,6 +65,7 @@ class ClientManager(object): self._project_domain_name = project_domain_name self._region_name = region_name self._api_version = api_version + self._trust_id = trust_id self._service_catalog = None # verify is the Requests-compatible form |