Merge pull request #4232 from edx/coryleeio/support_redis_as_backend_for_ecommerce

OPS-2492 Support redis as an ecommerce celery backend in edx/configur…

CHANGELOG.md

+- Role: ecomworker
+  - Added `ECOMMERCE_WORKER_BROKER_TRANSPORT` with a default value of 'ampq' to be backwards compatible with rabbit.  Set to 'redis' if you wish to use redis instead of rabbit as a queue for ecommerce worker.
+
+- Role: ecommerce
+  - Added `ECOMMERCE_BROKER_TRANSPORT` with a default value of 'ampq' to be backwards compatible with rabbit.  Set to 'redis' if you wish to use redis instead of rabbit as a queue for ecommerce.
+
 - Role: credentials
   - This role is now dependent on the edx_django_service role. Settings are all the same, but nearly all of the tasks are performed by the edx_django_service role.
 

playbooks/roles/ecommerce/defaults/main.yml

@@ -145,11 +145,10 @@ ECOMMERCE_STATICFILES_STORAGE: 'ecommerce.theming.storage.ThemeStorage'
 # Celery
 ECOMMERCE_BROKER_USERNAME: 'celery'
 ECOMMERCE_BROKER_PASSWORD: 'celery'
-# Used as the default RabbitMQ IP.
 ECOMMERCE_BROKER_HOST: '{{ ansible_default_ipv4.address }}'
-# Used as the default RabbitMQ port.
 ECOMMERCE_BROKER_PORT: 5672
-ECOMMERCE_BROKER_URL: 'amqp://{{ ECOMMERCE_BROKER_USERNAME }}:{{ ECOMMERCE_BROKER_PASSWORD }}@{{ ECOMMERCE_BROKER_HOST }}:{{ ECOMMERCE_BROKER_PORT }}'
+ECOMMERCE_BROKER_TRANSPORT: 'amqp'
+ECOMMERCE_BROKER_URL: '{{ ECOMMERCE_BROKER_TRANSPORT }}://{{ ECOMMERCE_BROKER_USERNAME }}:{{ ECOMMERCE_BROKER_PASSWORD }}@{{ ECOMMERCE_BROKER_HOST }}:{{ ECOMMERCE_BROKER_PORT }}'
 
 ECOMMERCE_DISCOVERY_SERVICE_URL: 'http://localhost:8008'
 ECOMMERCE_ENTERPRISE_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}'

playbooks/roles/ecomworker/defaults/main.yml

@@ -33,8 +33,9 @@ ECOMMERCE_WORKER_BROKER_PASSWORD: 'celery'
 ECOMMERCE_WORKER_BROKER_HOST: '{{ ansible_default_ipv4.address }}'
 # Used as the default RabbitMQ port.
 ECOMMERCE_WORKER_BROKER_PORT: 5672
+ECOMMERCE_WORKER_BROKER_TRANSPORT: 'amqp'
 # Default broker URL. See http://celery.readthedocs.org/en/latest/configuration.html#broker-url.
-ECOMMERCE_WORKER_BROKER_URL: 'amqp://{{ ECOMMERCE_WORKER_BROKER_USERNAME }}:{{ ECOMMERCE_WORKER_BROKER_PASSWORD }}@{{ ECOMMERCE_WORKER_BROKER_HOST }}:{{ ECOMMERCE_WORKER_BROKER_PORT }}'
+ECOMMERCE_WORKER_BROKER_URL: '{{ ECOMMERCE_WORKER_BROKER_TRANSPORT }}://{{ ECOMMERCE_WORKER_BROKER_USERNAME }}:{{ ECOMMERCE_WORKER_BROKER_PASSWORD }}@{{ ECOMMERCE_WORKER_BROKER_HOST }}:{{ ECOMMERCE_WORKER_BROKER_PORT }}'
 ECOMMERCE_WORKER_CONCURRENCY: 4
 # END CELERY