Merge pull request #82 from aboyett/fix-s3-us-east-1

fix(create_bucket): avoid S3 InvalidLocationConstraint error
deis · Feb 23, 2017 · 93f7910 · 93f7910
2 parents 1ef4525 + a885078
commit 93f7910
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/rootfs/bin/create-bucket b/rootfs/bin/create-bucket
@@ -25,7 +25,11 @@ if os.getenv('REGISTRY_STORAGE') == "s3" and os.getenv('REGISTRY_STORAGE_S3_BACK
     conn = boto.s3.connect_to_region(region)
 
     if not bucket_exists(conn, bucket_name):
-        conn.create_bucket(bucket_name, location=region)
+        if region == "us-east-1":
+            # use "US Standard" region. workaround for https://github.com/boto/boto3/issues/125
+            conn.create_bucket(bucket_name)
+        else:
+            conn.create_bucket(bucket_name, location=region)
 
 elif os.getenv('REGISTRY_STORAGE') == "gcs":
     scopes = ['https://www.googleapis.com/auth/devstorage.full_control']