Merge pull request #386 from edx/jarv/mongo-clusterd

mongo_clustered defaults to !!null

playbooks/roles/mongo/tasks/main.yml

@@ -46,7 +46,7 @@
     mode=0600
     owner=mongodb
     group=mongodb
-  when: MONGO_CLUSTERED is defined
+  when: MONGO_CLUSTERED
 
 - name: mongo | copy configuration template
   template: src=mongodb.conf.j2 dest=/etc/mongodb.conf backup=yes
@@ -60,11 +60,11 @@
 
 - name: mongo | Create the file to initialize the mongod replica set
   template: src=repset_init.j2 dest=/tmp/repset_init.js
-  when: MONGO_CLUSTERED is defined
+  when: MONGO_CLUSTERED
 
 - name: mongo | Initialize the replication set
   shell: /usr/bin/mongo  /tmp/repset_init.js
-  when: MONGO_CLUSTERED is defined
+  when: MONGO_CLUSTERED
 
 # Ignoring errors here because slave instances will fail this command
 # since slaveOk is false in ansible 1.3.

playbooks/roles/mongo/templates/mongodb.conf.j2

@@ -21,7 +21,7 @@ port = {{ mongo_port }}
 # Enable journaling, http://www.mongodb.org/display/DOCS/Journaling
 journal=true
 
-{% if MONGO_CLUSTERED is defined %}
+{% if MONGO_CLUSTERED %}
 keyFile = {{ mongo_key_file }}
 replSet = {{ mongo_repl_set }}
 {% endif %}