Update rabbit to be compatible with the new cloudformaiton templates.

playbooks/roles/rabbitmq/templates/rabbitmq.config.j2

@@ -4,9 +4,12 @@
 
 {%- if rabbitmq_clustered_hosts|length == 0 -%}
 {%- set hosts= [] -%}
+{%- set all_rabbit_hosts = [] -%}
+{%- do all_rabbit_hosts.extend(groups.tag_role_rabbitmq) -%}
+{%- do all_rabbit_hosts.extend(groups.tag_group_rabbitmq) -%}
 {%- for name in  group_names -%}
   {%- if name.startswith(rabbitmq_aws_stack_name) -%}
-    {%- for host in groups.tag_group_rabbitmq -%}
+    {%- for host in all_rabbit_hosts -%}
       {%- if host in groups[name] -%}
         {% do hosts.append("rabbit@ip-" + host.replace('.','-')) %}
       {%- endif -%}