From 5d830362a1932fb36c450b96a6f0f72380b650be Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Thu, 5 Dec 2019 15:56:54 +0100 Subject: [PATCH] Swift same by-pass structured store location --- README.md | 4 ++++ cloud_platform/models/cloud_platform.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/README.md b/README.md index 6dbef90..dbc57b5 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,10 @@ Besides, the attachment location should be set to `swift` (this is automatically done by the `install` methods of the `cloud_platform` module). * `ir.config_parameter` `ir_attachment.location`: `swift` +Structure of container name is checked against environment. +It is possible to by-pass this behavior by using the following environment variable: +`SWIFT_WRITE_CONTAINER_UNSTRUCTURED`. + ### Sessions in Redis * prod: diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py index e77f5c5..e74bd98 100644 --- a/cloud_platform/models/cloud_platform.py +++ b/cloud_platform/models/cloud_platform.py @@ -112,6 +112,13 @@ class CloudPlatform(models.AbstractModel): ) prod_container = bool(re.match(r'[a-z0-9-]+-odoo-prod', container_name)) + # A bucket name is defined under the following format + # -odoo- + # + # Use AWS_BUCKETNAME_UNSTRUCTURED to by-pass check on bucket name + # structure + if os.environ.get('SWIFT_WRITE_CONTAINER_UNSTRUCTURED'): + return if environment_name == 'prod': assert prod_container, ( "SWIFT_WRITE_CONTAINER should match '-odoo-prod', "