diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 22:29:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 22:29:03 +0000 |
| commit | cd0f34b2d69a253212f3f73f991b552ec2c078c2 (patch) | |
| tree | 8947bb869119b620efab87d321290a3c826bce3b /openstackclient/common | |
| parent | ce17a0b58877525cf39f0427f4874877fcf804ca (diff) | |
| parent | 0aa3c206a38b681e106ca8bfd82cab27cd7e1861 (diff) | |
| download | python-openstackclient-cd0f34b2d69a253212f3f73f991b552ec2c078c2.tar.gz | |
Merge "Remove tenant round 1 - global options"
Diffstat (limited to 'openstackclient/common')
| -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 |