diff --git a/defaults/main.yml b/defaults/main.yml
index 041015c..0f92e90 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -65,18 +65,22 @@ heat_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera
 
 ## Oslo Messaging Info
 # RPC
-heat_oslomsg_rpc_transport: rabbit
-heat_oslomsg_rpc_servers: 127.0.0.1
-heat_oslomsg_rpc_port: 5672
-heat_oslomsg_rpc_use_ssl: False
+heat_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
+heat_oslomsg_rpc_setup_host: "{{ (heat_oslomsg_rpc_host_group in groups) | ternary(groups[heat_oslomsg_rpc_host_group][0], 'localhost') }}"
+heat_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
+heat_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
+heat_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
+heat_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
 heat_oslomsg_rpc_userid: heat
 heat_oslomsg_rpc_vhost: /heat
 
 # Notify
-heat_oslomsg_notify_transport: rabbit
-heat_oslomsg_notify_servers: 127.0.0.1
-heat_oslomsg_notify_port: 5672
-heat_oslomsg_notify_use_ssl: False
+heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
+heat_oslomsg_notify_setup_host: "{{ (heat_oslomsg_notify_host_group in groups) | ternary(groups[heat_oslomsg_notify_host_group][0], 'localhost') }}"
+heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
+heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
+heat_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
+heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
 heat_oslomsg_notify_userid: heat
 heat_oslomsg_notify_vhost: /heat
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 7b4b4d7..ef5f048 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -94,6 +94,25 @@
   tags:
     - heat-config
 
+- include_tasks: mq_setup.yml
+  when:
+    - "heat_services['heat-api']['group'] in group_names"
+    - "inventory_hostname == ((groups[heat_services['heat-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
+  with_items:
+    - oslomsg_setup_host: "{{ heat_oslomsg_rpc_setup_host }}"
+      oslomsg_userid: "{{ heat_oslomsg_rpc_userid }}"
+      oslomsg_password: "{{ heat_oslomsg_rpc_password }}"
+      oslomsg_vhost: "{{ heat_oslomsg_rpc_vhost }}"
+      oslomsg_transport: "{{ heat_oslomsg_rpc_transport }}"
+    - oslomsg_setup_host: "{{ heat_oslomsg_notify_setup_host }}"
+      oslomsg_userid: "{{ heat_oslomsg_notify_userid }}"
+      oslomsg_password: "{{ heat_oslomsg_notify_password }}"
+      oslomsg_vhost: "{{ heat_oslomsg_notify_vhost }}"
+      oslomsg_transport: "{{ heat_oslomsg_notify_transport }}"
+  no_log: true
+  tags:
+    - heat-config
+
 - include: heat_db_setup.yml
   static: no
   when:
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
new file mode 100644
index 0000000..2ef034a
--- /dev/null
+++ b/tasks/mq_setup.yml
@@ -0,0 +1,45 @@
+---
+# Copyright 2018, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/mq_setup.yml
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository. Once it merges there, the changes will automatically be proposed to
+# all the repositories which use it.
+
+- name: Setup MQ Service (RabbitMQ)
+  delegate_to: "{{ item.oslomsg_setup_host }}"
+  when:
+    - "item.oslomsg_transport == 'rabbit'"
+  block:
+    - name: Add RabbitMQ vhost
+      rabbitmq_vhost:
+        name: "{{ item.oslomsg_vhost }}"
+        state: "present"
+
+    - name: Add RabbitMQ user
+      rabbitmq_user:
+        user: "{{ item.oslomsg_userid }}"
+        password: "{{ item.oslomsg_password }}"
+        vhost: "{{ item.oslomsg_vhost }}"
+        configure_priv: ".*"
+        read_priv: ".*"
+        write_priv: ".*"
+        state: "present"
+        force: true
+      no_log: true
+
+# Note: Add the tasks for additional MQ servers here