diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2013-07-29 11:11:11 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-07-31 10:07:50 -0500 |
| commit | 0aa3c206a38b681e106ca8bfd82cab27cd7e1861 (patch) | |
| tree | 90d23ca81ef61bbdf4b0e0deaa5d3002575573a9 /openstackclient/common/clientmanager.py | |
| parent | 9ec1cf385ee1434ebdb13a9de2f35024925ff50f (diff) | |
| download | python-openstackclient-0aa3c206a38b681e106ca8bfd82cab27cd7e1861.tar.gz | |
Remove tenant round 1 - global options
Change the global auth options to use 'project', leave the original
tenant options in place but silent for compatability with the existing
project CLI auth options. This is the only compatibility for tenant
usage in this changeover.
Change-Id: I3cce6e552f18822cc9f445ec5f301b0f5d9003f8
Diffstat (limited to 'openstackclient/common/clientmanager.py')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index a1b838a2..fdeca139 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -46,14 +46,14 @@ class ClientManager(object): image = ClientCache(image_client.make_client) volume = ClientCache(volume_client.make_client) - def __init__(self, token=None, url=None, auth_url=None, tenant_name=None, - tenant_id=None, username=None, password=None, + def __init__(self, token=None, url=None, auth_url=None, project_name=None, + project_id=None, username=None, password=None, region_name=None, api_version=None): self._token = token self._url = url self._auth_url = auth_url - self._tenant_name = tenant_name - self._tenant_id = tenant_id + self._project_name = project_name + self._project_id = project_id self._username = username self._password = password self._region_name = region_name |