Merge pull request #3631 from edx/george/rabbitmq-bindhost

Provide broker host var to ecomworker role

playbooks/edx_sandbox.yml

@@ -26,7 +26,8 @@
     SANDBOX_ENABLE_ECOMMERCE: False
     COMMON_ENABLE_SPLUNKFORWARDER: False
   roles:
-    - { role: swapfile, SWAPFILE_SIZE: "2GB" }
+    - role: swapfile
+      SWAPFILE_SIZE: 2GB
     - role: nginx
       nginx_sites:
       - certs
@@ -46,12 +47,15 @@
       when: "'localhost' in ' '.join(EDXAPP_MEMCACHE)"
     - role: mongo
       when: "'localhost' in EDXAPP_MONGO_HOSTS"
-    - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
-    - { role: 'edxapp', celery_worker: True }
+    - role: rabbitmq
+      rabbitmq_ip: 127.0.0.1
+    - role: edxapp
+      celery_worker: True
     - edxapp
     - role: ecommerce
       when: SANDBOX_ENABLE_ECOMMERCE
     - role: ecomworker
+      ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1
       when: SANDBOX_ENABLE_ECOMMERCE
     - programs
     - analytics_api
@@ -63,8 +67,10 @@
     - role: elasticsearch
       when: "'localhost' in EDXAPP_ELASTIC_SEARCH_CONFIG|map(attribute='host')"
     - forum
-    - { role: notifier, NOTIFIER_DIGEST_TASK_INTERVAL: "5" }
-    - { role: "xqueue", update_users: True }
+    - role: notifier
+      NOTIFIER_DIGEST_TASK_INTERVAL: 5
+    - role: xqueue
+      update_users: True
     - certs
     - edx_ansible
     - role: datadog

playbooks/vagrant-devstack.yml

@@ -26,13 +26,15 @@
     - edxlocal
     - memcache
     - mongo
-    - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
+    - role: rabbitmq
+      rabbitmq_ip: 127.0.0.1
     - edxapp
     - oraclejdk
     - elasticsearch
     - forum
     - ecommerce
-    - ecomworker
+    - role: ecomworker
+      ECOMMERCE_WORKER_BROKER_HOST: 127.0.0.1
     - programs
     - role: notifier
       NOTIFIER_DIGEST_TASK_INTERVAL: "5"