From e7c0ed77e521beaceac615b4206241af3fccfbc2 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Mon, 23 Jan 2017 20:39:29 -0500 Subject: [PATCH] Added settings for Docker-based devstack ECOM-6634 --- cms/envs/devstack_docker.py | 22 ++++++++++++++++++++++ lms/envs/devstack_docker.py | 24 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 cms/envs/devstack_docker.py create mode 100644 lms/envs/devstack_docker.py diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py new file mode 100644 index 0000000000..0c924ba498 --- /dev/null +++ b/cms/envs/devstack_docker.py @@ -0,0 +1,22 @@ +""" Overrides for Docker-based devstack. """ + +from .devstack import * # pylint: disable=wildcard-import, unused-wildcard-import + +# Docker does not support the syslog socket at /dev/log. Rely on the console. +LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = { + 'class': 'logging.NullHandler', +} + +LOGGING['loggers']['tracking']['handlers'] = ['console'] + +HOST = 'edx.devstack.edxapp:18000' +SITE_NAME = HOST +LMS_ROOT_URL = 'http://{}:18000'.format(HOST) + +OAUTH_OIDC_ISSUER = '{}/oauth2'.format(LMS_ROOT_URL) + +JWT_AUTH.update({ + 'JWT_SECRET_KEY': 'lms-secret', + 'JWT_ISSUER': OAUTH_OIDC_ISSUER, + 'JWT_AUDIENCE': 'lms-key', +}) diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py new file mode 100644 index 0000000000..3ed6ba55fa --- /dev/null +++ b/lms/envs/devstack_docker.py @@ -0,0 +1,24 @@ +""" Overrides for Docker-based devstack. """ + +from .devstack import * # pylint: disable=wildcard-import, unused-wildcard-import + +# Docker does not support the syslog socket at /dev/log. Rely on the console. +LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = { + 'class': 'logging.NullHandler', +} + +LOGGING['loggers']['tracking']['handlers'] = ['console'] + +HOST = 'edx.devstack.edxapp:18000' +SITE_NAME = HOST +LMS_ROOT_URL = 'http://{}:18000'.format(HOST) + +ECOMMERCE_PUBLIC_URL_ROOT = "http://edx.devstack.ecommerce:18130" + +OAUTH_OIDC_ISSUER = '{}/oauth2'.format(LMS_ROOT_URL) + +JWT_AUTH.update({ + 'JWT_SECRET_KEY': 'lms-secret', + 'JWT_ISSUER': OAUTH_OIDC_ISSUER, + 'JWT_AUDIENCE': 'lms-key', +})