Commit 7b19e117 by Simon Chen Committed by Clinton Blackburn

This change is to remove the program service from devstack since it's getting retired anyways

parent 6c71ed6d
...@@ -85,7 +85,6 @@ service. Since some services are not meant to be user-facing, the "homepage" may ...@@ -85,7 +85,6 @@ service. Since some services are not meant to be user-facing, the "homepage" may
| Catalog/Discovery | [http://localhost:18381/api-docs/](http://localhost:18381/api-docs/) | | Catalog/Discovery | [http://localhost:18381/api-docs/](http://localhost:18381/api-docs/) |
| E-Commerce/Otto | [http://localhost:18130/dashboard/](http://localhost:18130/dashboard/) | | E-Commerce/Otto | [http://localhost:18130/dashboard/](http://localhost:18130/dashboard/) |
| LMS | [http://localhost:18000/](http://localhost:18000/) | | LMS | [http://localhost:18000/](http://localhost:18000/) |
| Programs | [http://localhost:18140/api/v1/](http://localhost:18140/api/v1/) |
| Studio/CMS | [http://localhost:18010/](http://localhost:18010/) | | Studio/CMS | [http://localhost:18010/](http://localhost:18010/) |
...@@ -113,7 +112,6 @@ $ docker exec -t edx.devstack.<service> bash -c '/edx/app/supervisor/venvs/supe ...@@ -113,7 +112,6 @@ $ docker exec -t edx.devstack.<service> bash -c '/edx/app/supervisor/venvs/supe
* discovery * discovery
* ecommerce * ecommerce
* edxapp * edxapp
* programs
## Remaining Work ## Remaining Work
......
...@@ -9,7 +9,6 @@ repos=( ...@@ -9,7 +9,6 @@ repos=(
"https://github.com/edx/credentials.git" "https://github.com/edx/credentials.git"
"https://github.com/edx/ecommerce.git" "https://github.com/edx/ecommerce.git"
"https://github.com/edx/edx-platform.git" "https://github.com/edx/edx-platform.git"
"https://github.com/edx/programs.git"
) )
name_pattern=".*edx/(.*).git" name_pattern=".*edx/(.*).git"
......
...@@ -110,20 +110,6 @@ services: ...@@ -110,20 +110,6 @@ services:
# volumes: # volumes:
# - ../edx-platform:/edx/app/edxapp/edx-platform # - ../edx-platform:/edx/app/edxapp/edx-platform
programs:
command: /edx/app/programs/devstack.sh start
container_name: edx.devstack.programs
depends_on:
- mysql
- memcached
environment:
ENABLE_DJANGO_TOOLBAR: 1
image: edxops/programs:devstack
ports:
- "18140:18140"
volumes:
- ../programs:/edx/app/programs/programs
volumes: volumes:
elasticsearch_data: elasticsearch_data:
mongo_data: mongo_data:
......
...@@ -53,7 +53,7 @@ docker exec -t edx.devstack.edxapp bash -c 'source /edx/app/edxapp/edxapp_env & ...@@ -53,7 +53,7 @@ docker exec -t edx.devstack.edxapp bash -c 'source /edx/app/edxapp/edxapp_env &
docker exec -t edx.devstack.edxapp bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/edx-east/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"' & docker exec -t edx.devstack.edxapp bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/edx-east/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"' &
# We must fake an associative array for Bash 3 users # We must fake an associative array for Bash 3 users
services=('credentials:18150' 'discovery:18381' 'ecommerce:18130' 'programs:18140') services=('credentials:18150' 'discovery:18381' 'ecommerce:18130')
for service in "${services[@]}" for service in "${services[@]}"
do do
...@@ -77,7 +77,7 @@ done ...@@ -77,7 +77,7 @@ done
docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py oscar_populate_countries' & docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py oscar_populate_countries' &
# TODO Create discovery tenant with correct credentials (ECOM-6565) # TODO Create discovery tenant with correct credentials (ECOM-6565)
docker exec -t edx.devstack.discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py create_or_update_partner --code edx --name edX --courses-api-url "http://edx.devstack.edxapp:18000/api/courses/v1/" --ecommerce-api-url "http://edx.devstack.ecommerce:18130/api/v2/" --organizations-api-url "http://edx.devstack.edxapp:18000/api/organizations/v0/" --programs-api-url "http://edx.devstack.programs:18140/api/v1/" --oidc-url-root "http://edx.devstack.edxapp:18000/oauth2" --oidc-key discovery-key --oidc-secret discovery-secret' & docker exec -t edx.devstack.discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py create_or_update_partner --code edx --name edX --courses-api-url "http://edx.devstack.edxapp:18000/api/courses/v1/" --ecommerce-api-url "http://edx.devstack.ecommerce:18130/api/v2/" --organizations-api-url "http://edx.devstack.edxapp:18000/api/organizations/v0/" --oidc-url-root "http://edx.devstack.edxapp:18000/oauth2" --oidc-key discovery-key --oidc-secret discovery-secret' &
# TODO Create credentials tenant (ECOM-6566) # TODO Create credentials tenant (ECOM-6566)
......
...@@ -12,7 +12,4 @@ CREATE DATABASE IF NOT EXISTS edxapp_csmh; ...@@ -12,7 +12,4 @@ CREATE DATABASE IF NOT EXISTS edxapp_csmh;
GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password'; GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password';
GRANT ALL ON edxapp_csmh.* TO 'edxapp001'@'%'; GRANT ALL ON edxapp_csmh.* TO 'edxapp001'@'%';
CREATE DATABASE IF NOT EXISTS programs;
GRANT ALL ON programs.* TO 'programs001'@'%' IDENTIFIED BY 'password';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
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