Better handle mongodb-org

defaults/main.yml

@@ -9,7 +9,7 @@ mongodb_additional_packages:
 - python-pymongo
 
 mongodb_user: mongodb
-mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' == mongodb_package) else 'mongodb' }}"
+mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' in mongodb_package) else 'mongodb' }}"
 
 mongodb_conf_auth: no                             # Run with security
 mongodb_conf_bind_ip: 127.0.0.1                   # Comma separated list of ip addresses to listen on

tasks/install.deb.yml

@@ -4,11 +4,11 @@
 
 - name: Add APT key
   apt_key: url=http://docs.mongodb.org/10gen-gpg-key.asc id=7F0CEB10
-  when: mongodb_package == 'mongodb-org'
+  when: '"mongodb-org" in mongodb_package'
 
 - name: Add APT repository
   apt_repository: repo="{{mongodb_repository}}" update_cache=yes
-  when: mongodb_package == 'mongodb-org'
+  when: '"mongodb-org" in mongodb_package'
 
 - name: Install MongoDB package
   apt: pkg={{mongodb_package}} state=present