Commit b2a4b53b by Clinton Blackburn Committed by Clinton Blackburn

Using shared file for Docker Devstack config

This file serves as a location to store variables common to the services in Docker Devstack. It currently contains the variables for the LMS root URLs and OAuth/OpenID Connect configuration.

PLAT-1573
parent 35a2eef5
EDXAPP_LMS_BASE: 'edx.devstack.lms:18000'
EDXAPP_LMS_ROOT_URL: 'http://{{ EDXAPP_LMS_BASE }}'
EDXAPP_LMS_PUBLIC_ROOT_URL: 'http://localhost:18000'
COMMON_OAUTH_LOGOUT_URL: '{{ EDXAPP_LMS_PUBLIC_ROOT_URL }}/logout'
COMMON_OAUTH_PUBLIC_URL_ROOT: '{{ EDXAPP_LMS_PUBLIC_ROOT_URL }}/oauth2'
COMMON_OAUTH_URL_ROOT: '{{ EDXAPP_LMS_ROOT_URL }}/oauth2'
COMMON_JWT_AUDIENCE: 'lms-key'
COMMON_JWT_SECRET_KEY: 'lms-secret'
......@@ -16,10 +16,12 @@ ADD . /edx/app/edx_ansible/edx_ansible
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY docker/build/discovery/ansible_overrides.yml /
COPY docker/build/devstack/ansible_overrides.yml /devstack/ansible_overrides.yml
RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook discovery.yml \
-c local -i '127.0.0.1,' \
-t 'install,assets,devstack' \
--extra-vars="@/ansible_overrides.yml"
--extra-vars="@/ansible_overrides.yml" \
--extra-vars="@/devstack/ansible_overrides.yml"
EXPOSE 18381
......@@ -5,10 +5,6 @@ DISCOVERY_VERSION: 'master'
COMMON_MYSQL_MIGRATE_USER: '{{ DISCOVERY_MYSQL_USER }}'
COMMON_MYSQL_MIGRATE_PASS: '{{ DISCOVERY_MYSQL_PASSWORD }}'
EDXAPP_LMS_BASE: 'edx.devstack.lms:18000'
EDXAPP_LMS_ROOT_URL: 'http://{{ EDXAPP_LMS_BASE }}'
EDXAPP_LMS_PUBLIC_ROOT_URL: 'http://localhost:18000'
DISCOVERY_MYSQL: 'edx.devstack.mysql'
DISCOVERY_DJANGO_SETTINGS_MODULE: 'course_discovery.settings.devstack'
DISCOVERY_ELASTICSEARCH_HOST: 'edx.devstack.elasticsearch'
......
......@@ -19,6 +19,7 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY docker/build/edxapp/ansible_overrides.yml /
COPY docker/build/edxapp/devstack.yml /
COPY docker/build/devstack/ansible_overrides.yml /devstack/ansible_overrides.yml
ARG OPENEDX_RELEASE=master
ENV OPENEDX_RELEASE=${OPENEDX_RELEASE}
......@@ -27,6 +28,7 @@ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook edxapp.yml
-t 'install,assets,devstack' \
--extra-vars=edx_platform_version=${OPENEDX_RELEASE} \
--extra-vars="@/ansible_overrides.yml" \
--extra-vars="@/devstack.yml"
--extra-vars="@/devstack.yml" \
--extra-vars="@/devstack/ansible_overrides.yml"
EXPOSE 18000 18010
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment