Commit 77f39b9a by Ned Batchelder

No more need for SANDBOX_ENABLE_ECOMMERCE

(cherry picked from commit 3f496fb1)
parent bb5bc41f
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
edx_platform_version: 'master' edx_platform_version: 'master'
# Set to false if deployed behind another proxy/load balancer. # Set to false if deployed behind another proxy/load balancer.
NGINX_SET_X_FORWARDED_HEADERS: True NGINX_SET_X_FORWARDED_HEADERS: True
# These should stay false for the public AMI
COMMON_ENABLE_DATADOG: False
SANDBOX_ENABLE_ECOMMERCE: False
COMMON_ENABLE_SPLUNKFORWARDER: False
DISCOVERY_URL_ROOT: 'http://localhost:{{ DISCOVERY_NGINX_PORT }}' DISCOVERY_URL_ROOT: 'http://localhost:{{ DISCOVERY_NGINX_PORT }}'
roles: roles:
- role: swapfile - role: swapfile
...@@ -36,12 +32,9 @@ ...@@ -36,12 +32,9 @@
- lms - lms
- forum - forum
- xqueue - xqueue
- ecommerce
nginx_default_sites: nginx_default_sites:
- lms - lms
- role: nginx
nginx_sites:
- ecommerce
when: SANDBOX_ENABLE_ECOMMERCE
- role: edxlocal - role: edxlocal
when: EDXAPP_MYSQL_HOST == 'localhost' when: EDXAPP_MYSQL_HOST == 'localhost'
- role: memcache - role: memcache
...@@ -53,11 +46,9 @@ ...@@ -53,11 +46,9 @@
- role: edxapp - role: edxapp
celery_worker: True celery_worker: True
- edxapp - edxapp
- role: ecommerce - ecommerce
when: SANDBOX_ENABLE_ECOMMERCE
- role: ecomworker - role: ecomworker
ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1 ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1
when: SANDBOX_ENABLE_ECOMMERCE
- analytics_api - analytics_api
- insights - insights
# not ready yet: - edx_notes_api # not ready yet: - edx_notes_api
......
...@@ -54,7 +54,6 @@ VERSION_VARS=( ...@@ -54,7 +54,6 @@ VERSION_VARS=(
ECOMMERCE_WORKER_VERSION ECOMMERCE_WORKER_VERSION
) )
EXTRA_VARS="-e SANDBOX_ENABLE_ECOMMERCE=True $EXTRA_VARS"
for var in ${VERSION_VARS[@]}; do for var in ${VERSION_VARS[@]}; do
# Each variable can be overridden by a similarly-named environment variable, # Each variable can be overridden by a similarly-named environment variable,
# or OPENEDX_RELEASE, if provided. # or OPENEDX_RELEASE, if provided.
......
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