openstack
/
swift
Code Issues Proposed changes

Merge "Restore the syntax -U tenant:user"

This commit is contained in:
Jenkins 2012-04-26 20:37:46 +00:00 committed by Gerrit Code Review
parent f5af3c4305 6b91352007
commit 097eb83c49
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift
View File

@ -199,6 +199,10 @@ def _get_auth_v1_0(url, user, key, snet):
def _get_auth_v2_0(url, user, tenant_name, key, snet):
if not tenant_name and ':' in user:
tenant_name, user = user.split(':', 1)
if not tenant_name:
raise ClientException('No tenant specified')
body = {'auth': {'passwordCredentials':
{'password': key, 'username': user},
'tenantName': tenant_name}}
@ -250,8 +254,6 @@ def get_auth(url, user, key, snet=False, tenant_name=None, auth_version="1.0"):
if auth_version in ["1.0", "1"]:
return _get_auth_v1_0(url, user, key, snet)
elif auth_version in ["2.0", "2"]:
if not tenant_name:
raise ClientException('No tenant specified')
return _get_auth_v2_0(url, user, tenant_name, key, snet)