openstack/python-swiftclient
Code Issues Proposed changes

Allow specify the tenant in user.

Browse Source 
- This is to allow the -U tenant:user syntax like previously supported
  when not using the os_ arguments.
This commit is contained in:
Chmouel Boudjnah 2012-05-08 14:05:21 +01:00
parent b55acc34f0
commit 9ee3ee6e6d
1 changed files with 6 additions and 4 deletions

10
bin/swift

@ -937,12 +937,14 @@ def parse_args(parser, args, enforce_requires=True):
if (not (options.auth and options.user and options.key) or if (not (options.auth and options.user and options.key) or
options.os_auth_url): options.os_auth_url):
# Use 2.0 auth if none of the old args are present # Use 2.0 auth if none of the old args are present
options.auth_version = "2.0" options.auth_version = '2.0'
if options.auth_version == "2.0" and not options.os_tenant_name and \ if options.auth_version in ('2.0', '2') and not \
options.os_username and options.os_username.find(':'): options.os_tenant_name and options.user and \
':' in options.user:
(options.os_tenant_name, (options.os_tenant_name,
options.os_username) = options.os_username.split(':') options.os_username) = options.user.split(':')
options.user = options.os_username
# Use new-style args if old ones not present # Use new-style args if old ones not present
if not options.auth and options.os_auth_url: if not options.auth and options.os_auth_url: