Merge pull request #388 from edx/jarv/rabbit-cluster

fixing check for cluster config

playbooks/roles/rabbitmq/defaults/main.yml

 #Variables for rabbitmq
 ---
+
+# Environment specific vars
+RABBIT_ERLANG_COOKIE: 'DEFAULT_COOKIE'
+RABBIT_USERS:
+  - name: 'admin'
+    password: 'the example admin password'
+  - name: 'edx'
+    password: 'edx'
+  - name: 'celery'
+    password: 'celery'
+
+RABBITMQ_CLUSTERED: !!null
+
+# Internal role variables below this line
+
 rabbitmq_apt_key: "http://www.rabbitmq.com/rabbitmq-signing-key-public.asc"
 rabbitmq_repository: "deb http://www.rabbitmq.com/debian/ testing main"
 rabbitmq_pkg: "rabbitmq-server"
@@ -16,18 +31,6 @@ rabbitmq_port: 5672
 rabbitmq_management_port: 15672
 rabbitmq_ip: "{{ ansible_default_ipv4.address }}"
 
-# Vars meant to be overridden.
-RABBIT_ERLANG_COOKIE: 'DEFAULT_COOKIE'
-RABBIT_USERS:
-  - name: 'admin'
-    password: 'the example admin password'
-  - name: 'edx'
-    password: 'edx'
-  - name: 'celery'
-    password: 'celery'
-
-RABBITMQ_CLUSTERED: !!null
-
 # Structure for auth config file.
 rabbitmq_auth_config:
   erlang_cookie: $RABBIT_ERLANG_COOKIE

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

@@ -2,7 +2,7 @@
    and also a rabbitmq machine.
 #}
 
-{%- if RABBITMQ_CLUSTERED is defined -%}
+{%- if RABBITMQ_CLUSTERED -%}
 {%- set hosts= [] -%}
 {%- set all_rabbit_hosts = [] -%}
 {%- do all_rabbit_hosts.extend(groups.tag_role_rabbitmq) -%}