From 45af829aa5ef81b8eaf6f4f75f8d2b602b6d499a Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@enovance.com>
Date: Wed, 27 Feb 2013 13:52:24 +0100
Subject: [PATCH] Allow v2 to use storage_url/storage_token directly
- Fixes bug 1134306.
Change-Id: Ie1737c57f57bcdad50b3096c921d46a1fe5293b8
---
bin/swift | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/bin/swift b/bin/swift
index 7c653cad..16373e17 100755
--- a/bin/swift
+++ b/bin/swift
@@ -1036,6 +1036,11 @@ def parse_args(parser, args, enforce_requires=True):
'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 \
not (options.auth and options.user and options.key):
exit('''
@@ -1104,7 +1109,8 @@ Example:
parser.add_option('--os-tenant-id',
metavar='<auth-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',
help=SUPPRESS_HELP)
parser.add_option('--os-tenant-name',