Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-24 02:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use keystoneauth v3 for Swift attachments

Browse Source
This commit is contained in:
Mussie Sirak
2020-03-04 11:09:55 +01:00
committed by Patrick Tombez
co-authored by Patrick Tombez
parent d214e82a46
commit d319b42fce
3 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
attachment_swift/models/ir_attachment.py
+15 -9
View File
@@ -47,18 +47,18 @@ class SwiftSessionStore(object):
def __init__(self):
self._sessions = {}
def _get_key(self, auth_url, username, password, tenant_name):
return (auth_url, username, password, tenant_name)
def _get_key(self, auth_url, username, password, project_name):
return (auth_url, username, password, project_name)
def get_session(self, auth_url=None, username=None, password=None,
tenant_name=None):
key = self._get_key(auth_url, username, password, tenant_name)
project_name=None):
key = self._get_key(auth_url, username, password, project_name)
session = self._sessions.get(key)
if not session:
auth = keystoneauth1.identity.v2.Password(
auth = keystoneauth1.identity.v3.Password(
username=username,
password=password,
tenant_name=tenant_name,
project_name=project_name,
auth_url=auth_url,
)
session = keystoneauth1.session.Session(
@@ -86,12 +86,18 @@ class IrAttachment(models.Model):
host = os.environ.get('SWIFT_AUTH_URL')
account = os.environ.get('SWIFT_ACCOUNT')
password = os.environ.get('SWIFT_PASSWORD')
tenant_name = os.environ.get('SWIFT_TENANT_NAME')
project_name = os.environ.get('SWIFT_PROJECT_NAME')
if not project_name and os.environ.get('SWIFT_TENANT_NAME'):
project_name = os.environ['SWIFT_TENANT_NAME']
_logger.warning(
"SWIFT_TENANT_NAME is deprecated and "
"must be replaced by SWIFT_PROJECT_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):
if not (host and account and password and project_name):
raise exceptions.UserError(_(
"Problem connecting to Swift store, are the env variables "
"(SWIFT_AUTH_URL, SWIFT_ACCOUNT, SWIFT_PASSWORD, "
@@ -101,7 +107,7 @@ class IrAttachment(models.Model):
session = swift_session_store.get_session(
username=account,
password=password,
tenant_name=tenant_name,
project_name=project_name,
auth_url=host,
)
conn = swiftclient.client.Connection(