Merge pull request #371 from edx/feanil/update_jenkins_mongo

Update the jenkins worker to use the mongo role.

playbooks/jenkins_worker.yml

@@ -6,5 +6,10 @@
   hosts: jenkins_worker
   sudo: True
   gather_facts: True
+  vars:
+      COMMON_DATA_DIR: '/mnt'
+      COMMON_LOG_DIR: '/mnt/log'
   roles:
+    - common
+    - mongo
     - jenkins_worker

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -22,7 +22,6 @@ jenkins_debian_pkgs:
     - libgeos-dev
     - libmysqlclient-dev
     - libxslt1-dev
-    - mongodb
     - npm
     - pkg-config
     - python2.7

playbooks/roles/jenkins_worker/tasks/mongo.yml

@@ -5,12 +5,6 @@
 - name: jenkins_worker | Stop mongo service
   service: name=mongodb state=stopped
 
-- name: jenkins_worker | Configure Mongo
-  template: src=mongodb_conf.j2
-    dest=/etc/mongodb.conf
-    owner=root
-    group=root
-
 - name: jenkins_worker | Configure Mongo upstart script
   template: src=mongodb_upstart.j2
     dest=/etc/init/mongodb.conf

playbooks/roles/jenkins_worker/templates/mongodb_conf.j2

-# mongodb.conf
-
-dbpath={{ mongo_dir }}
-logpath={{ mongo_log_dir }}/mongodb.log
-
-logappend=true
-
-bind_ip = 127.0.0.1
-port = 27017
-
-journal=true