From 4a1ecf50a50f628efb2eb0db55c48367bc646619 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 2 Aug 2019 13:38:26 -0700 Subject: [PATCH] Fix CORS in rackspace in upload-logs-swift The CDN setup that rackspace has requires that the Access-Control-Allow-Origin header be added to each object uploaded. Change-Id: I0f6af613e2ebcf9cfe835dc8018a73922f9f0ed5 --- roles/upload-logs-swift/library/zuul_swift_upload.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/upload-logs-swift/library/zuul_swift_upload.py b/roles/upload-logs-swift/library/zuul_swift_upload.py index 6d2ac7214..de5339340 100755 --- a/roles/upload-logs-swift/library/zuul_swift_upload.py +++ b/roles/upload-logs-swift/library/zuul_swift_upload.py @@ -497,10 +497,13 @@ class Uploader(): # The ceph radosgw swift implementation requires an # index.html at the root in order for any other indexes to # work. + index_headers = {'access-control-allow-origin': '*'} self.cloud.create_object(self.container, name='index.html', data='', - content_type='text/html') + content_type='text/html', + **index_headers) + # Enable the CDN in rax if cdn_url: self.cloud.session.put(cdn_url) @@ -574,6 +577,8 @@ class Uploader(): if self.delete_after: headers['x-delete-after'] = str(self.delete_after) headers['content-type'] = file_detail.mimetype + # This is required for Rackspace CDN + headers['access-control-allow-origin'] = '*' for attempt in range(1, POST_ATTEMPTS + 1): try: