From 4b4fbf0dc0d2e918b88c1e387f462faca7e98ffd Mon Sep 17 00:00:00 2001
From: David Kranz <david.kranz@qrclab.com>
Date: Tue, 28 Aug 2012 10:25:42 -0400
Subject: Allow endpoint type to be specified.

Fixes bug 1037690.

Change-Id: I36b3807b2f3234c778316f1e743d27304755aed8
---
 bin/swift | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'bin')

diff --git a/bin/swift b/bin/swift
index e855e54..550a7f1 100755
--- a/bin/swift
+++ b/bin/swift
@@ -1025,6 +1025,7 @@ def parse_args(parser, args, enforce_requires=True):
         'tenant_id': options.os_tenant_id,
         'tenant_name': options.os_tenant_name,
         'service_type': options.os_service_type,
+        'endpoint_type': options.os_endpoint_type,
         'auth_token': options.os_auth_token,
         'object_storage_url': options.os_storage_url,
     }
@@ -1133,6 +1134,11 @@ Example:
                            'Defaults to env[OS_SERVICE_TYPE]')
     parser.add_option('--os_service_type',
                       help=SUPPRESS_HELP)
+    parser.add_option('--os-endpoint-type',
+                      metavar='<endpoint-type>',
+                      default=environ.get('OS_ENDPOINT_TYPE'),
+                      help='Openstack Endpoint type. (publicURL, e.g.)' \
+                           'Defaults to env[OS_ENDPOINT_TYPE]')
     parser.disable_interspersed_args()
     (options, args) = parse_args(parser, argv[1:], enforce_requires=False)
     parser.enable_interspersed_args()
-- 
cgit v1.2.1