Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 7b19e11

Browse files
schenedxclintonb
authored andcommitted
This change is to remove the program service from devstack since it's getting retired anyways
1 parent 6c71ed6 commit 7b19e11

File tree

5 files changed

+2
-22
lines changed

5 files changed

+2
-22
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ service. Since some services are not meant to be user-facing, the "homepage" may
8585
| Catalog/Discovery | [http://localhost:18381/api-docs/](http://localhost:18381/api-docs/) |
8686
| E-Commerce/Otto | [http://localhost:18130/dashboard/](http://localhost:18130/dashboard/) |
8787
| LMS | [http://localhost:18000/](http://localhost:18000/) |
88-
| Programs | [http://localhost:18140/api/v1/](http://localhost:18140/api/v1/) |
8988
| Studio/CMS | [http://localhost:18010/](http://localhost:18010/) |
9089

9190

@@ -113,7 +112,6 @@ $ docker exec -t edx.devstack.<service> bash -c '/edx/app/supervisor/venvs/supe
113112
* discovery
114113
* ecommerce
115114
* edxapp
116-
* programs
117115

118116
## Remaining Work
119117

clone.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ repos=(
99
"https://github.com/edx/credentials.git"
1010
"https://github.com/edx/ecommerce.git"
1111
"https://github.com/edx/edx-platform.git"
12-
"https://github.com/edx/programs.git"
1312
)
1413

1514
name_pattern=".*edx/(.*).git"

docker-compose.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,6 @@ services:
110110
# volumes:
111111
# - ../edx-platform:/edx/app/edxapp/edx-platform
112112

113-
programs:
114-
command: /edx/app/programs/devstack.sh start
115-
container_name: edx.devstack.programs
116-
depends_on:
117-
- mysql
118-
- memcached
119-
environment:
120-
ENABLE_DJANGO_TOOLBAR: 1
121-
image: edxops/programs:devstack
122-
ports:
123-
- "18140:18140"
124-
volumes:
125-
- ../programs:/edx/app/programs/programs
126-
127113
volumes:
128114
elasticsearch_data:
129115
mongo_data:

provision.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ docker exec -t edx.devstack.edxapp bash -c 'source /edx/app/edxapp/edxapp_env &
5353
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"' &
5454

5555
# We must fake an associative array for Bash 3 users
56-
services=('credentials:18150' 'discovery:18381' 'ecommerce:18130' 'programs:18140')
56+
services=('credentials:18150' 'discovery:18381' 'ecommerce:18130')
5757

5858
for service in "${services[@]}"
5959
do
@@ -77,7 +77,7 @@ done
7777
docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py oscar_populate_countries' &
7878

7979
# TODO Create discovery tenant with correct credentials (ECOM-6565)
80-
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' &
80+
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' &
8181

8282
# TODO Create credentials tenant (ECOM-6566)
8383

provision.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ CREATE DATABASE IF NOT EXISTS edxapp_csmh;
1212
GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password';
1313
GRANT ALL ON edxapp_csmh.* TO 'edxapp001'@'%';
1414

15-
CREATE DATABASE IF NOT EXISTS programs;
16-
GRANT ALL ON programs.* TO 'programs001'@'%' IDENTIFIED BY 'password';
17-
1815
FLUSH PRIVILEGES;

0 commit comments

Comments
 (0)