Merge pull request wal-e#66 from brosner/add-endpoint-type

added support for swift endpoint_type

wal_e/blobstore/swift/calling_format.py

@@ -11,5 +11,8 @@ def connect(creds):
         key=creds.password,
         auth_version="2",
         tenant_name=creds.tenant_name,
-        os_options={"region_name": creds.region},
+        os_options={
+            "region_name": creds.region,
+            "endpoint_type": creds.endpoint_type
+        }
     )

wal_e/blobstore/swift/credentials.py

@@ -1,7 +1,9 @@
 class Credentials(object):
-    def __init__(self, authurl, user, password, tenant_name, region):
+    def __init__(self, authurl, user, password, tenant_name, region,
+            endpoint_type):
         self.authurl = authurl
         self.user = user
         self.password = password
         self.tenant_name = tenant_name
         self.region = region
+        self.endpoint_type = endpoint_type

wal_e/cmd.py

@@ -436,6 +436,7 @@ def _env_hint(optname):
             os.getenv('SWIFT_PASSWORD'),
             os.getenv('SWIFT_TENANT'),
             os.getenv('SWIFT_REGION'),
+            os.getenv('SWIFT_ENDPOINT_TYPE', 'publicURL'),
         )
         return SwiftBackup(store, creds, gpg_key_id)
     else: