Merge pull request #3447 from edx/bdero/rabbitmq-vhost-config

Make AMQP vhost and TLS configurable for xqueue/celery

CHANGELOG.md

@@ -200,3 +200,10 @@
 - Role: mongo_3_0
   - Changed MONGO_STORAGE_ENGINE to default to wiredTiger which is the default in 3.2 and 3.4 and what edX suggests be used even on 3.0.
     If you have a mmapv1 3.0 install, override MONGO_STORAGE_ENGINE to be mmapv1 which was the old default.
+
+- Role: xqueue
+  - Added `EDXAPP_CELERY_BROKER_USE_SSL` to allow configuring celery to use TLS.
+
+- Role: edxapp
+  - Added `XQUEUE_RABBITMQ_VHOST` to allow configuring the xqueue RabbitMQ host.
+  - Added `XQUEUE_RABBITMQ_PORT` and `XQUEUE_RABBITMQ_TLS` to allow configuring the RabbitMQ port, and enabling TLS respectively.

playbooks/roles/edxapp/defaults/main.yml

@@ -134,6 +134,7 @@ EDXAPP_ZENDESK_API_KEY: ""
 EDXAPP_CELERY_USER: 'celery'
 EDXAPP_CELERY_PASSWORD: 'celery'
 EDXAPP_CELERY_BROKER_VHOST: ""
+EDXAPP_CELERY_BROKER_USE_SSL: false
 
 EDXAPP_VIDEO_CDN_URLS:
   EXAMPLE_COUNTRY_CODE: "http://example.com/edx/video?s3_url="
@@ -823,6 +824,7 @@ generic_env_config:  &edxapp_generic_env
   ANALYTICS_DATA_URL: "{{ EDXAPP_ANALYTICS_DATA_URL }}"
   ANALYTICS_DASHBOARD_URL: '{{ EDXAPP_ANALYTICS_DASHBOARD_URL }}'
   CELERY_BROKER_VHOST: "{{ EDXAPP_CELERY_BROKER_VHOST }}"
+  CELERY_BROKER_USE_SSL: "{{ EDXAPP_CELERY_BROKER_USE_SSL }}"
   PAYMENT_SUPPORT_EMAIL: "{{ EDXAPP_PAYMENT_SUPPORT_EMAIL }}"
   ZENDESK_URL: "{{ EDXAPP_ZENDESK_URL }}"
   COURSES_WITH_UNSAFE_CODE: "{{ EDXAPP_COURSES_WITH_UNSAFE_CODE }}"

playbooks/roles/xqueue/defaults/main.yml

@@ -45,7 +45,10 @@ XQUEUE_DJANGO_USERS:
   lms: 'password'
 XQUEUE_RABBITMQ_USER: 'edx'
 XQUEUE_RABBITMQ_PASS: 'edx'
+XQUEUE_RABBITMQ_VHOST: '/'
 XQUEUE_RABBITMQ_HOSTNAME: 'localhost'
+XQUEUE_RABBITMQ_PORT: 5672
+XQUEUE_RABBITMQ_TLS: true
 XQUEUE_LANG: 'en_US.UTF-8'
 
 XQUEUE_MYSQL_DB_NAME: 'xqueue'
@@ -82,6 +85,9 @@ xqueue_env_config:
   SYSLOG_SERVER: "{{ XQUEUE_SYSLOG_SERVER }}"
   LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"
   RABBIT_HOST: "{{ XQUEUE_RABBITMQ_HOSTNAME }}"
+  RABBIT_PORT: "{{ XQUEUE_RABBITMQ_PORT }}"
+  RABBIT_VHOST: "{{ XQUEUE_RABBITMQ_VHOST }}"
+  RABBIT_TLS: "{{ XQUEUE_RABBITMQ_TLS }}"
   LOCAL_LOGLEVEL: "{{ XQUEUE_LOCAL_LOGLEVEL }}"
   UPLOAD_BUCKET: "{{ XQUEUE_UPLOAD_BUCKET }}"
   UPLOAD_PATH_PREFIX: "{{ XQUEUE_UPLOAD_PATH_PREFIX }}"