Skip to content

Commit b73bf28

Browse files
mumarkhan999mumarkhan999
authored
Merge pull request #83 from edx/umar/add-license-manager-ida
feat: add license manager ida to devstack
2 parents 6d5392b + 48f2763 commit b73bf28

File tree

12 files changed

+141
-8
lines changed

12 files changed

+141
-8
lines changed

‎.github/workflows/provisioning-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
os:
3131
- ubuntu-20.04 # Ubuntu 20.04 "Focal Fossa"
3232
python-version: [ '3.11' ]
33-
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms, enterprise-catalog+lms]
33+
services: [ discovery+lms+forum ,registrar+lms, ecommerce+lms, edx_notes_api+lms, credentials+lms, xqueue, analyticsapi+insights+lms, enterprise-catalog+lms, license-manager+lms]
3434
fail-fast: false # some services can be flaky; let others run to completion even if one fails
3535

3636
steps:

‎check.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,12 @@ if should_check analyticsapi; then
156156
"curl --fail -L http://localhost:19001/health/"
157157
fi
158158

159+
if should_check license-manager; then
160+
echo "Running License Manager Devstack tests: "
161+
run_check license_manager_heartbeat license-manager \
162+
"curl --fail -L http://localhost:18170/health/"
163+
fi
164+
159165
echo "Successful checks:${succeeded:- NONE}"
160166
echo "Failed checks:${failed:- NONE}"
161167
if [[ -z "$succeeded" ]] && [[ -z "$failed" ]]; then

‎docker-compose-host.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,21 @@ services:
8181
enterprise-catalog-curations-worker:
8282
volumes:
8383
- ${DEVSTACK_WORKSPACE}/enterprise-catalog:/edx/app/enterprise_catalog/enterprise_catalog
84+
license-manager:
85+
volumes:
86+
- ${DEVSTACK_WORKSPACE}/license-manager:/edx/app/license_manager
87+
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
88+
- ${PWD}/py_configuration_files/license_manager.py:/edx/app/license_manager/license_manager/settings/devstack.py
89+
license-manager-worker:
90+
volumes:
91+
- ${DEVSTACK_WORKSPACE}/license-manager:/edx/app/license_manager
92+
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
93+
- ${PWD}/py_configuration_files/license_manager.py:/edx/app/license_manager/license_manager/settings/devstack.py
94+
bulk-enrollment-worker:
95+
volumes:
96+
- ${DEVSTACK_WORKSPACE}/license-manager:/edx/app/license_manager
97+
- ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
98+
- ${PWD}/py_configuration_files/license_manager.py:/edx/app/license_manager/license_manager/settings/devstack.py
8499
# Note that frontends mount `src` to /edx/app/src instead of /edx/src.
85100
# See ADR #5 for rationale.
86101
frontend-app-account:

‎docker-compose.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,72 @@ services:
769769
stdin_open: true
770770
tty: true
771771

772+
license-manager:
773+
image: edxops/license-manager-dev:latest
774+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.license-manager"
775+
hostname: license-manager.devstack.edx
776+
# Use the Django devserver, so that we can hot-reload code changes
777+
command: bash -c 'while true; do python /edx/app/license_manager/manage.py runserver 0.0.0.0:18170; sleep 2; done'
778+
ports:
779+
- "18170:18170"
780+
depends_on:
781+
- mysql80
782+
- license-manager-worker
783+
# Allows attachment to this container using 'docker attach <containerID>'.
784+
stdin_open: true
785+
tty: true
786+
environment:
787+
CELERY_ALWAYS_EAGER: 'false'
788+
CELERY_BROKER_TRANSPORT: redis
789+
CELERY_BROKER_HOSTNAME: edx.devstack.redis:6379
790+
CELERY_BROKER_VHOST: 0
791+
CELERY_BROKER_PASSWORD: password
792+
DJANGO_SETTINGS_MODULE: license_manager.settings.devstack
793+
DJANGO_WATCHMAN_TIMEOUT: 30
794+
ENABLE_DJANGO_TOOLBAR: 1
795+
796+
license-manager-worker:
797+
image: edxops/license-manager-dev:latest
798+
command: bash -c 'cd /edx/app/license_manager/license_manager && celery -A license_manager worker -Q license_manager.default -l DEBUG'
799+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.license-manager-worker"
800+
hostname: license-manager-worker.devstack.edx
801+
depends_on:
802+
- mysql80
803+
environment:
804+
CELERY_ALWAYS_EAGER: 'false'
805+
CELERY_BROKER_TRANSPORT: redis
806+
CELERY_BROKER_HOSTNAME: edx.devstack.redis:6379
807+
CELERY_BROKER_VHOST: 0
808+
CELERY_BROKER_PASSWORD: password
809+
DJANGO_SETTINGS_MODULE: license_manager.settings.devstack
810+
COLUMNS: 80
811+
ports:
812+
- "18171:18171"
813+
restart: always
814+
stdin_open: true
815+
tty: true
816+
817+
bulk-enrollment-worker:
818+
image: edxops/license-manager-dev:latest
819+
command: bash -c 'cd /edx/app/license_manager/license_manager && celery -A license_manager worker -Q license_manager.bulk_enrollment -l DEBUG'
820+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.license-manager.bulk-enrollment-worker"
821+
hostname: license-manager.bulk-enrollment-worker.devstack.edx
822+
depends_on:
823+
- mysql80
824+
environment:
825+
CELERY_ALWAYS_EAGER: 'false'
826+
CELERY_BROKER_TRANSPORT: redis
827+
CELERY_BROKER_HOSTNAME: edx.devstack.redis:6379
828+
CELERY_BROKER_VHOST: 0
829+
CELERY_BROKER_PASSWORD: password
830+
DJANGO_SETTINGS_MODULE: license_manager.settings.devstack
831+
COLUMNS: 80
832+
ports:
833+
- "18172:18172"
834+
restart: always
835+
stdin_open: true
836+
tty: true
837+
772838
# ==========================================================================
773839
# edX Microfrontends
774840
#

‎docs/service_list.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ Instead of a service name or list, you can also run commands like ``make dev.pro
6161
+------------------------------------+-------------------------------------+----------------+--------------+
6262
| `analyticsapi`_ | http://localhost:19001 | Python/Django | Extra |
6363
+------------------------------------+-------------------------------------+----------------+--------------+
64+
| `license-manager`_ | http://localhost:18171 | Python/Django | Extra |
65+
+------------------------------------+-------------------------------------+----------------+--------------+
6466
| `frontend-app-ora-grading`_ | http://localhost:1993 | MFE (React.js) | Extra |
6567
+------------------------------------+-------------------------------------+----------------+--------------+
6668
| `enterprise-catalog`_ | http://localhost:18160/ | Python/Django | Extra |
@@ -98,3 +100,4 @@ Some common service combinations include:
98100
.. _insights: https://github.com/edx/edx-analytics-dashboard
99101
.. _analyticsapi: https://github.com/edx/edx-analytics-data-api
100102
.. _enterprise-catalog: https://github.com/openedx/enterprise-catalog
103+
.. _license-manager: https://github.com/openedx/license-manager

‎options.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ credentials+discovery+ecommerce+edx_notes_api+forum+frontend-app-authn+frontend-
6767
# Separated by plus signs.
6868
# Separated by plus signs. Listed in alphabetical order for clarity.
6969
EDX_SERVICES ?= \
70-
analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise-catalog
70+
analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_notes_api+forum+frontend-app-account+frontend-app-learner-dashboard+frontend-app-learner-record+frontend-app-profile+frontend-app-authn+frontend-app-course-authoring+frontend-app-gradebook+frontend-app-ora-grading+frontend-app-learning+frontend-app-library-authoring+frontend-app-payment+frontend-app-program-console+frontend-app-publisher+insights+lms+lms-worker+lms_watcher+registrar+registrar-worker+xqueue+xqueue_consumer+enterprise-catalog+license-manager
7171

7272
# Services with database migrations.
7373
# Should be a subset of $(EDX_SERVICES).
@@ -76,7 +76,7 @@ analyticsapi+credentials+cms+cms-worker+cms_watcher+discovery+ecommerce+edx_note
7676
# Note: This list should contain _all_ db-backed services, even if not
7777
# configured to run; the list will be filtered later against $(DEFAULT_SERVICES).
7878
DB_SERVICES ?= \
79-
credentials+cms+discovery+ecommerce+lms+registrar
79+
credentials+cms+discovery+ecommerce+lms+registrar+license-manager
8080

8181
# Services with static assets to be built.
8282
# Should be a subset of $(EDX_SERVICES).

‎provision-license-manager.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env bash
2+
# Provisioning script for the notes service
3+
set -eu -o pipefail
4+
5+
. scripts/colors.sh
6+
set -x
7+
8+
name=license-manager
9+
port=18170
10+
11+
docker compose up -d $name
12+
docker compose up -d lms
13+
14+
echo -e "${GREEN}Installing requirements for ${name}...${NC}"
15+
docker compose exec -T ${name} bash -e -c 'cd /edx/app/license_manager/ && make requirements' -- "$name"
16+
# Run migrations
17+
echo -e "${GREEN}Running migrations for ${name}...${NC}"
18+
docker compose exec -T ${name} bash -e -c "cd /edx/app/license_manager/ && make migrate" -- "$name"
19+
20+
# Seed data for development
21+
echo -e "${GREEN}Seeding development data..."
22+
docker compose exec -T ${name} bash -e -c "python manage.py seed_development_data" -- "$name"
23+
# Some migrations require development data to be seeded, hence migrating again.
24+
docker compose exec -T ${name} bash -e -c "make migrate" -- "$name"
25+
26+
# Create superuser
27+
echo -e "${GREEN}Creating super-user for ${name}...${NC}"
28+
docker compose exec -T ${name} bash -e -c "echo 'from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"[email protected]\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None' | python /edx/app/license_manager/manage.py shell" -- "$name"
29+
30+
# Provision IDA User in LMS
31+
./provision-ida-user.sh ${name} ${name} $port
32+
33+
make dev.restart-devserver.license-manager

‎provision-mysql80.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ GRANT ALL ON `reports`.* TO 'analytics001'@'%';
4343
CREATE DATABASE IF NOT EXISTS `reports_v1`;
4444
GRANT ALL ON `reports_v1`.* TO 'analytics001'@'%';
4545

46+
CREATE DATABASE IF NOT EXISTS license_manager;
47+
CREATE USER IF NOT EXISTS 'license_manager001'@'%' IDENTIFIED BY 'password';
48+
GRANT ALL ON license_manager.* TO 'license_manager001'@'%';
49+
4650
CREATE DATABASE IF NOT EXISTS edxapp;
4751
CREATE DATABASE IF NOT EXISTS edxapp_csmh;
4852
CREATE USER IF NOT EXISTS 'edxapp001'@'%' IDENTIFIED BY 'password';

‎provision.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ coursegraph \
5050
insights \
5151
analyticsapi \
5252
enterprise-catalog \
53+
license-manager \
5354
"
5455

5556
# What should we provision?

‎provision.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ GRANT ALL ON `reports_v1`.* TO 'analytics001'@'%' IDENTIFIED BY 'password';
3636
CREATE DATABASE IF NOT EXISTS `enterprise_catalog`;
3737
GRANT ALL ON `enterprise_catalog`.* TO 'catalog001'@'%' IDENTIFIED BY 'password';
3838

39+
CREATE DATABASE IF NOT EXISTS license_manager;
40+
GRANT ALL ON license_manager.* TO 'license_manager001'@'%' IDENTIFIED BY 'password';
41+
3942
FLUSH PRIVILEGES;

0 commit comments

Comments
 (0)