Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add enterprise-catalog in devstack #81

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

huniafatima-arbi
Copy link
Member

No description provided.

@huniafatima-arbi huniafatima-arbi self-assigned this Nov 19, 2024
@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-enterprise-catalog-in-devstack branch from 5d90f7a to 7678187 Compare November 20, 2024 09:21
docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
provision.sh Outdated Show resolved Hide resolved
provision-enterprise_catalog.sh Outdated Show resolved Hide resolved
provision-enterprise_catalog.sh Outdated Show resolved Hide resolved
@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-enterprise-catalog-in-devstack branch from 54705a2 to 343b4cd Compare November 22, 2024 19:04
Copy link
Member

@iamsobanjaved iamsobanjaved left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more changes, also you need to rebase it correctly with main branch as it is currently also including the changes from master.

stdin_open: true
tty: true

enterprise-catalog-curations_worker:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
enterprise-catalog-curations_worker:
enterprise-catalog-curations-worker:

@@ -910,3 +986,4 @@ volumes:
mysql57_data:
mysql80_data:
redis_data:
enterprise_catalog_mysql8:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't be used, because this isn't linked with mysql80 container. These IDAs should use default devstack db volume so no need to add this


# Run migrations
echo -e "${GREEN}Running migrations for ${name}...${NC}"
docker exec -t enterprise.catalog.app bash -c "cd /edx/app/${name}/${name}/ && make migrate"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use docker compose exec and then you don't have to provide the entire container name and instead can only write enterprsie-subsidy. You can follow any other provision script for the format.

Comment on lines 18 to 20
# Create the DOT applications - one for single sign-on and one for backend service IDA-to-IDA authentication.
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type authorization-code --skip-authorization --redirect-uris 'http://localhost:${port}/complete/edx-oauth2/' --client-id '${name}-sso-key' --client-secret '${name}-sso-secret' --scopes 'user_id' ${name}-sso ${name}_worker"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_dot_application --grant-type client-credentials --client-id '${name}-backend-service-key' --client-secret '${name}-backend-service-secret' ${name}-backend-service ${name}_worker"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also included in provision-ida-user.sh script.


# Provision IDA User in LMS
echo -e "${GREEN}Provisioning ${name}_worker in LMS...${NC}"
docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user ${name}_worker ${name}[email protected] --staff --superuser"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@huniafatima-arbi huniafatima-arbi force-pushed the huniafatima/add-enterprise-catalog-in-devstack branch from 343b4cd to 9105836 Compare November 28, 2024 08:21

enterprise-catalog:
volumes:
- ${DEVSTACK_WORKSPACE}/enterprise-catalog:/edx/app/enterprise_catalog/enterprise_catalog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add devstack.py file reference as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants