@@ -43,11 +43,11 @@ docker-compose up -d
4343./load-db.sh edxapp_csmh
4444
4545# Run edxapp migrations first since they are needed for the service users and OAuth clients
46- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack '
46+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker '
4747
4848# Create a superuser for edxapp
49- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack manage_user edx edx@example.com --superuser --staff'
50- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell --settings=devstack ' &
49+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
50+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell --settings=devstack_docker ' &
5151
5252# We must fake an associative array for Bash 3 users
5353services=(' credentials:18150' ' discovery:18381' ' ecommerce:18130' ' programs:18140' )
6464 docker exec -t edx.devstack.${name} bash -c ' source /edx/app/$1/$1_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"edx@example.com\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None" | python /edx/app/$1/$1/manage.py shell' -- " $name " &
6565
6666 echo -e " ${GREEN} Creating service user and OAuth client for ${name} ...${NC} "
67- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack manage_user $1_worker $1_worker@example.com --staff' -- " $name " &
68- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack create_oauth2_client "http://localhost:$2" "http://localhost:$2/complete/edx-oidc/" confidential --client_name $1 --client_id "$1-key" --client_secret "$1-secret" --trusted --logout_uri "http://localhost:$2/logout/" --username $1_worker' -- " $name " " $port " &
67+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user $1_worker $1_worker@example.com --staff' -- " $name " &
68+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_oauth2_client "http://localhost:$2" "http://localhost:$2/complete/edx-oidc/" confidential --client_name $1 --client_id "$1-key" --client_secret "$1-secret" --trusted --logout_uri "http://localhost:$2/logout/" --username $1_worker' -- " $name " " $port " &
6969done
7070
7171
9191# TODO Consider loading demo course/users via Ansible play?
9292
9393# Save the longest for last...
94- docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack '
94+ docker exec -t edx.devstack.edxapp bash -c ' source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker '
9595
9696echo -e " ${GREEN} Provisioning complete!${NC} "
0 commit comments