Merge pull request #3718 from open-craft/bdero/rabbitmq-fix-default-tls

Change the default XQUEUE_RABBITMQ_TLS value to false

CHANGELOG.md

+- Role: xqueue
+  - Changed `XQUEUE_RABBITMQ_TLS` default from `true` to `false`.
+
 - Role: credentials
   - Added `CREDENTIALS_EXTRA_APPS` to enable the inclusion of additional Django apps in the Credentials Service.
 - Role: common
@@ -210,11 +213,12 @@
   - Added `MONGO_AUTH` to turn authentication on/off. Auth is now enabled by default, and was previously disabled by default.
 
 - Role: xqueue
-  - Added `EDXAPP_CELERY_BROKER_USE_SSL` to allow configuring celery to use TLS.
+  - Added `XQUEUE_RABBITMQ_TLS` to allow configuring xqueue to use TLS when connecting to the AMQP broker.
+  - Added `XQUEUE_RABBITMQ_VHOST` to allow configuring the xqueue RabbitMQ host.
+  - Added `XQUEUE_RABBITMQ_PORT` to allow configuring the RabbitMQ port.
 
 - 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.
+  - Added `EDXAPP_CELERY_BROKER_USE_SSL` to allow configuring celery to use TLS.
 
 - Role: ecommerce
   - Added `ECOMMERCE_ENTERPRISE_URL` for the `enterprise` API endpoint exposed by a new service `edx-enterprise` (currently hosted by `LMS`), which defaults to the existing setting `ECOMMERCE_LMS_URL_ROOT`.

playbooks/roles/xqueue/defaults/main.yml

@@ -48,7 +48,7 @@ XQUEUE_RABBITMQ_PASS: 'edx'
 XQUEUE_RABBITMQ_VHOST: '/'
 XQUEUE_RABBITMQ_HOSTNAME: 'localhost'
 XQUEUE_RABBITMQ_PORT: 5672
-XQUEUE_RABBITMQ_TLS: true
+XQUEUE_RABBITMQ_TLS: false
 XQUEUE_LANG: 'en_US.UTF-8'
 
 XQUEUE_MYSQL_DB_NAME: 'xqueue'