Skip to content

C
configuration
Commit 1cfb0719 by Feanil Patel
Options

Update how workers are started.

parent 555fed9e
Showing with 8 additions and 8 deletions
playbooks/edx-east/edx_dev2.yml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
lms_nginx_port: 80 lms_nginx_port: 80
cms_nginx_port: 80 cms_nginx_port: 80
edxapp_lms_env: 'lms.envs.load_test' edxapp_lms_env: 'lms.envs.load_test'
lms_version: 'd84de2f890df6a6ed2bcf38c71d67cf7be4962a2' lms_version: 'sarina/install-datadog'
- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_worker - hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_worker
sudo: True sudo: True
vars_files: vars_files:
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
- role: 'edxapp' - role: 'edxapp'
edxapp_lms_env: 'lms.envs.load_test' edxapp_lms_env: 'lms.envs.load_test'
celery_worker: True celery_worker: True
lms_version: 'd84de2f890df6a6ed2bcf38c71d67cf7be4962a2' lms_version: 'sarina/install-datadog'
#- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_xserver #- hosts: tag_aws_cloudformation_stack-name_dev2:&tag_group_xserver
# sudo: True # sudo: True
# vars_files: # vars_files:
......
playbooks/roles/edxapp/templates/edx-worker-cms.conf.j2
...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE} ...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE}
#env NEWRELIC={{venv_dir}}/bin/newrelic-admin #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
env CONCURRENCY=${CONCURRENCY} env CONCURRENCY=${CONCURRENCY}
env LOGLEVEL=info env LOGLEVEL=info
env DJANGO_SETTINGS_MODULE=cms.envs.aws env DJANGO_SETTINGS_MODULE=aws
env PYTHONPATH={{edx_platform_code_dir}} env PYTHONPATH={{edx_platform_code_dir}}
env SERVICE_VARIANT=${SERVICE_VARIANT} env SERVICE_VARIANT=${SERVICE_VARIANT}
...@@ -21,4 +21,4 @@ setuid www-data ...@@ -21,4 +21,4 @@ setuid www-data
chdir {{edx_platform_code_dir}} chdir {{edx_platform_code_dir}}
exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY exec {{venv_dir}}/bin/python {{edx_platform_code_dir}}/manage.py $SERVICE_VARIANT --settings=$DJANGO_SETTINGS_MODULE celery worker --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
playbooks/roles/edxapp/templates/edx-worker-lms-xml.conf.j2
...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE} ...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE}
#env NEWRELIC={{venv_dir}}/bin/newrelic-admin #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
env CONCURRENCY=${CONCURRENCY} env CONCURRENCY=${CONCURRENCY}
env LOGLEVEL=info env LOGLEVEL=info
env DJANGO_SETTINGS_MODULE=lms.envs.aws env DJANGO_SETTINGS_MODULE=aws
env PYTHONPATH={{edx_platform_code_dir}} env PYTHONPATH={{edx_platform_code_dir}}
env SERVICE_VARIANT=${SERVICE_VARIANT} env SERVICE_VARIANT=${SERVICE_VARIANT}
...@@ -21,4 +21,4 @@ setuid www-data ...@@ -21,4 +21,4 @@ setuid www-data
chdir {{edx_platform_code_dir}} chdir {{edx_platform_code_dir}}
exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY exec {{venv_dir}}/bin/python {{edx_platform_code_dir}}/manage.py $SERVICE_VARIANT --settings=$DJANGO_SETTINGS_MODULE celery worker --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
playbooks/roles/edxapp/templates/edx-worker-lms.conf.j2
...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE} ...@@ -13,7 +13,7 @@ instance edx.${SERVICE_VARIANT}.core.${QUEUE}
#env NEWRELIC={{venv_dir}}/bin/newrelic-admin #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
env CONCURRENCY=${CONCURRENCY} env CONCURRENCY=${CONCURRENCY}
env LOGLEVEL=info env LOGLEVEL=info
env DJANGO_SETTINGS_MODULE=lms.envs.aws env DJANGO_SETTINGS_MODULE=aws
env PYTHONPATH={{edx_platform_code_dir}} env PYTHONPATH={{edx_platform_code_dir}}
env SERVICE_VARIANT=${SERVICE_VARIANT} env SERVICE_VARIANT=${SERVICE_VARIANT}
...@@ -21,4 +21,4 @@ setuid www-data ...@@ -21,4 +21,4 @@ setuid www-data
chdir {{edx_platform_code_dir}} chdir {{edx_platform_code_dir}}
exec {{venv_dir}}/bin/django-admin.py celery worker --settings=$DJANGO_SETTINGS_MODULE --pythonpath=$PYTHONPATH --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY exec {{venv_dir}}/bin/python {{edx_platform_code_dir}}/manage.py $SERVICE_VARIANT --settings=$DJANGO_SETTINGS_MODULE celery worker --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
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