Propagage region_name to swift connection

Otherwise, the bucket will be in the incorrect region
This commit is contained in:
Guewen Baconnier
2018-03-16 09:10:58 +01:00
parent 5706146f18
commit 529c4066fa
2 changed files with 10 additions and 2 deletions
+7 -1
View File
@@ -36,6 +36,10 @@ class IrAttachment(models.Model):
account = os.environ.get('SWIFT_ACCOUNT')
password = os.environ.get('SWIFT_PASSWORD')
tenant_name = os.environ.get('SWIFT_TENANT_NAME')
region = os.environ.get('SWIFT_REGION_NAME')
os_options = {}
if region:
os_options['region_name'] = region
if not (host and account and password and tenant_name):
raise exceptions.UserError(_(
"Problem connecting to Swift store, are the env variables "
@@ -47,7 +51,9 @@ class IrAttachment(models.Model):
user=account,
key=password,
tenant_name=tenant_name,
auth_version='2.0')
auth_version='2.0',
os_options=os_options,
)
except ClientException:
_logger.exception('Error connecting to Swift object store')
raise exceptions.UserError(_('Error on Swift connection'))