Add region_name support1.2.0

Add --os-region-name (and OS_REGION_NAME env) to bin/swift
Add region_name to the os_options in Connection class.

bug 1019832

Change-Id: Id8515d97e5351638dce10581c7368f61518e1fa7

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/swift b/bin/swift
index 550a7f1..e69dcd0 100755
--- a/bin/swift
+++ b/bin/swift
@@ -1028,6 +1028,7 @@ def parse_args(parser, args, enforce_requires=True):
         'endpoint_type': options.os_endpoint_type,
         'auth_token': options.os_auth_token,
         'object_storage_url': options.os_storage_url,
+        'region_name': options.os_region_name,
     }
 
     # Handle trailing '/' in URL
@@ -1127,6 +1128,13 @@ Example:
                            'Defaults to env[OS_STORAGE_URL]')
     parser.add_option('--os_storage_url',
                       help=SUPPRESS_HELP)
+    parser.add_option('--os-region-name',
+                      metavar='<region-name>',
+                      default=environ.get('OS_REGION_NAME'),
+                      help='Openstack region name. '
+                           'Defaults to env[OS_REGION_NAME]')
+    parser.add_option('--os_region_name',
+                      help=SUPPRESS_HELP)
     parser.add_option('--os-service-type',
                       metavar='<service-type>',
                       default=environ.get('OS_SERVICE_TYPE'),