openstack/python-barbicanclient
Code Issues Proposed changes

remove last marconi refs

Browse Source
This commit is contained in:
Paul Kehrer
2013-05-31 08:51:19 -05:00
parent 811bd30f62
commit 60a1101041
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
barbicanclient/common/auth.py
View File

@@ -14,7 +14,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
:param auth_url: The keystone auth endpoint to use
:param user: The username to use for auth
:param key: The apikey to use for authentiation
:param endpoint: The Marconi endpoint to use. IOW, don't
:param endpoint: The Barbican endpoint to use. IOW, don't
look up an endpoint in the service catalog, just use
this one instead.
:param tenant_name: The optional tenant-name to use
@@ -26,7 +26,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
the service catalog
:param region_name The region to pass for authentication
:returns: Tuple containing Marconi endpoint and token
:returns: Tuple containing Barbican endpoint and token
:raises: ClientException
"""
@@ -67,4 +67,4 @@ def authenticate(auth_url, user, key, tenant, **kwargs):
except exceptions.EndpointNotFound as ex:
raise ClientException('Endpoint not found in service catalog')
return endpoint, _ksclient.auth_token
return endpoint, _ksclient.auth_token

2
tox.ini
View File

@@ -24,7 +24,7 @@ commands = flake8
commands = {posargs}
[testenv:cover]
commands = nosetests --with-coverage --cover-package=marconiclient
commands = nosetests --with-coverage --cover-package=barbicanclient
[tox:jenkins]
downloadcache = ~/cache/pip