Merge pull request #4729 from obmarg/registry-create-bucket-fixes

fix(registry): fix create_bucket s3 compatability
deis · Nov 10, 2015 · 293d657 · 293d657
2 parents 7410fb7 + 89027a8
commit 293d657
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/registry/templates/create_bucket b/registry/templates/create_bucket
@@ -8,13 +8,22 @@ conn = boto.connect_s3(
     {{ if exists "/deis/store/gateway/accessKey" }}
     aws_access_key_id='{{ getv "/deis/store/gateway/accessKey" }}',
     aws_secret_access_key='{{ getv "/deis/store/gateway/secretKey" }}',
-    {{end}}
+    {{ else }}
+    {{ if exists "/deis/registry/s3accessKey" }}
+    aws_access_key_id='{{ getv "/deis/registry/s3accessKey" }}',
+    aws_secret_access_key='{{ getv "/deis/registry/s3secretKey" }}',
+    {{ end }}
+    {{ end }}
     {{ if exists "/deis/store/gateway/host" }}
     host='{{ getv "/deis/store/gateway/host" }}',
     port={{ getv "/deis/store/gateway/port" }},
     {{ end }}
+    {{ if exists "/deis/registry/s3bucket" }}
+    is_secure=True)
+    {{ else }}
     is_secure=False,
     calling_format=OrdinaryCallingFormat())
+    {{ end }}
 
 {{ if exists "/deis/registry/s3bucket" }}
 name = '{{ getv "/deis/registry/s3bucket" }}'