Merge pull request #4351 from edx/jibsheet/remove-unused-config

Remove xqueue SERVICE_VARIANT and old variables

CHANGELOG.md

+- Role: xqueue
+  - Remove S3_BUCKET and S3_PATH_PREFIX - they were deprecated prior to ginkgo
+  - Remove SERVICE_VARIANT - it was copied from edxapp but never truly used (except to complicate things)
+
 - Role: edxapp
   - Added `ENTERPRISE_REPORTING_SECRET` to CMS auth settings to allow edx-enterprise migrations to run.
 

playbooks/roles/xqueue/defaults/main.yml

@@ -22,10 +22,6 @@ XQUEUE_SYSLOG_SERVER: 'localhost'
 XQUEUE_UPLOAD_BUCKET: 'sandbox-bucket'
 XQUEUE_UPLOAD_PATH_PREFIX: 'sandbox-xqueue'
 
-# Deprecated, use XQUEUE_UPLOAD_BUCKET and XQUEUE_UPLOAD_PATH_PREFIX
-XQUEUE_S3_BUCKET : "{{ XQUEUE_UPLOAD_BUCKET }}"
-XQUEUE_S3_PATH_PREFIX: "{{ XQUEUE_UPLOAD_PATH_PREFIX }}"
-
 XQUEUE_LOCAL_LOGLEVEL: 'INFO'
 
 XQUEUE_AWS_ACCESS_KEY_ID : ''
@@ -93,10 +89,6 @@ xqueue_env_config:
   UPLOAD_BUCKET: "{{ XQUEUE_UPLOAD_BUCKET }}"
   UPLOAD_PATH_PREFIX: "{{ XQUEUE_UPLOAD_PATH_PREFIX }}"
 
-  # Deprecated, use UPLOAD_BUCKET and UPLOAD_PATH_PREFIX instead
-  S3_BUCKET: "{{ XQUEUE_S3_BUCKET }}"
-  S3_PATH_PREFIX: "{{ XQUEUE_S3_PATH_PREFIX }}"
-
 xqueue_auth_config:
   AWS_ACCESS_KEY_ID:  "{{ XQUEUE_AWS_ACCESS_KEY_ID }}"
   AWS_SECRET_ACCESS_KEY: "{{ XQUEUE_AWS_SECRET_ACCESS_KEY }}"

playbooks/roles/xqueue/tasks/deploy.yml

@@ -88,7 +88,7 @@
 # If there is a common user for migrations run migrations using his username
 # and credentials. If not we use the xqueue mysql user
 - name: Migrate
-  shell: "SERVICE_VARIANT=xqueue {{ xqueue_venv_bin }}/django-admin.py migrate --noinput --settings=xqueue.{{ XQUEUE_SETTINGS }} --pythonpath={{ xqueue_code_dir }}"
+  shell: "{{ xqueue_venv_bin }}/django-admin.py migrate --noinput --settings=xqueue.{{ XQUEUE_SETTINGS }} --pythonpath={{ xqueue_code_dir }}"
   become_user: "{{ xqueue_user }}"
   environment:
     DB_MIGRATION_USER: "{{ COMMON_MYSQL_MIGRATE_USER }}"

playbooks/roles/xqueue/templates/xqueue.conf.j2

@@ -11,7 +11,7 @@ command={{ executable }} -c {{ xqueue_app_dir }}/xqueue_gunicorn.py {{ XQUEUE_GU
 user={{ common_web_user }}
 directory={{ xqueue_code_dir }}
 
-environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQUEUE_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}PID=/var/tmp/xqueue.pid,PORT={{ xqueue_gunicorn_port }},ADDRESS={{ xqueue_gunicorn_host }},LANG={{ XQUEUE_LANG }},DJANGO_SETTINGS_MODULE=xqueue.{{ XQUEUE_SETTINGS }},SERVICE_VARIANT="xqueue"
+environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_APP_NAME={{ XQUEUE_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}PID=/var/tmp/xqueue.pid,PORT={{ xqueue_gunicorn_port }},ADDRESS={{ xqueue_gunicorn_host }},LANG={{ XQUEUE_LANG }},DJANGO_SETTINGS_MODULE=xqueue.{{ XQUEUE_SETTINGS }}
 
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log

playbooks/roles/xqueue/templates/xqueue_consumer.conf.j2

@@ -5,7 +5,7 @@ command={{ xqueue_venv_bin }}/django-admin.py run_consumer --pythonpath={{ xqueu
 user={{ common_web_user }}
 directory={{ xqueue_code_dir }}
 
-environment=LANG={{ XQUEUE_LANG }},WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}},SERVICE_VARIANT="xqueue"
+environment=LANG={{ XQUEUE_LANG }},WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}}
 
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
 stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log