openstack/python-swiftclient
Code Issues Proposed changes

Merge "Allow v2 to use storage_url/storage_token directly"

Browse Source
This commit is contained in:
Jenkins 2013-03-19 18:36:04 +00:00 committed by Gerrit Code Review
commit f31916051d
1 changed files with 7 additions and 1 deletions

8
bin/swift

@ -1050,6 +1050,11 @@ def parse_args(parser, args, enforce_requires=True):
'region_name': options.os_region_name, 'region_name': options.os_region_name,
} }
if (options.os_options.get('object_storage_url') and
options.os_options.get('auth_token') and
options.auth_version == '2.0'):
return options, args
if enforce_requires and \ if enforce_requires and \
not (options.auth and options.user and options.key): not (options.auth and options.user and options.key):
exit(''' exit('''
@ -1118,7 +1123,8 @@ Example:
parser.add_option('--os-tenant-id', parser.add_option('--os-tenant-id',
metavar='<auth-tenant-id>', metavar='<auth-tenant-id>',
default=environ.get('OS_TENANT_ID'), default=environ.get('OS_TENANT_ID'),
help='OpenStack tenant ID. Defaults to env[OS_TENANT_ID]') help='OpenStack tenant ID. '
'Defaults to env[OS_TENANT_ID]')
parser.add_option('--os_tenant_id', parser.add_option('--os_tenant_id',
help=SUPPRESS_HELP) help=SUPPRESS_HELP)
parser.add_option('--os-tenant-name', parser.add_option('--os-tenant-name',