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

Backport support of 'labs' RUNNING_ENV

Browse Source
This commit is contained in:
Yannick Vaucher
2021-11-16 14:24:27 +01:00
parent d01f07ea59
commit 6713fe25fb
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloud_platform/models/cloud_platform.py
+13 -4
View File
@@ -59,6 +59,7 @@ class CloudPlatform(models.AbstractModel):
configs = { configs = {
'prod': PlatformConfig(filestore=FilestoreKind.s3), 'prod': PlatformConfig(filestore=FilestoreKind.s3),
'integration': PlatformConfig(filestore=FilestoreKind.s3), 'integration': PlatformConfig(filestore=FilestoreKind.s3),
'labs': PlatformConfig(filestore=FilestoreKind.s3),
'test': PlatformConfig(filestore=FilestoreKind.db), 'test': PlatformConfig(filestore=FilestoreKind.db),
'dev': PlatformConfig(filestore=FilestoreKind.db), 'dev': PlatformConfig(filestore=FilestoreKind.db),
} }
@@ -80,6 +81,14 @@ class CloudPlatform(models.AbstractModel):
def install_exoscale(self): def install_exoscale(self):
self.install('exoscale') self.install('exoscale')
def _get_running_env(self):
environment_name = config['running_env']
if environment_name.startswith('labs'):
# We allow to have environments such as 'labs-logistics'
# or 'labs-finance', in order to have the matching ribbon.
environment_name = 'labs'
return environment_name
@api.model @api.model
def _install(self, platform_kind): def _install(self, platform_kind):
assert platform_kind in self._platform_kinds() assert platform_kind in self._platform_kinds()
@@ -103,10 +112,10 @@ class CloudPlatform(models.AbstractModel):
@api.model @api.model
def _check_redis(self, environment_name): def _check_redis(self, environment_name):
if environment_name in ('prod', 'integration', 'test'): if environment_name in ('prod', 'integration', 'labs', 'test'):
assert is_true(os.environ.get('ODOO_SESSION_REDIS')), ( assert is_true(os.environ.get('ODOO_SESSION_REDIS')), (
"Redis must be activated on prod, integration, test instances." "Redis must be activated on prod, integration, labs,"
"This is done by setting ODOO_SESSION_REDIS=1." " test instances. This is done by setting ODOO_SESSION_REDIS=1."
) )
assert (os.environ.get('ODOO_SESSION_REDIS_HOST') or assert (os.environ.get('ODOO_SESSION_REDIS_HOST') or
os.environ.get('ODOO_SESSION_REDIS_SENTINEL_HOST') or os.environ.get('ODOO_SESSION_REDIS_SENTINEL_HOST') or
@@ -122,7 +131,7 @@ class CloudPlatform(models.AbstractModel):
) )
prefix = os.environ['ODOO_SESSION_REDIS_PREFIX'] prefix = os.environ['ODOO_SESSION_REDIS_PREFIX']
assert re.match(r'[a-z]+[a-z0-9]*-odoo-[a-z]+[0-9]*', prefix), ( assert re.match(r'^[a-z-0-9]+-odoo-[a-z-0-9]+$', prefix), (
"ODOO_SESSION_REDIS_PREFIX must match '<client>-odoo-<env>'" "ODOO_SESSION_REDIS_PREFIX must match '<client>-odoo-<env>'"
", we got: '%s'" % (prefix,) ", we got: '%s'" % (prefix,)
) )