Merge pull request #351 from edx/feanil/mongo_role

Feanil/mongo role

playbooks/edx-east/edx_sandbox.yml

@@ -19,6 +19,7 @@
       - cms
       - lms-preview
     - edxlocal
+    - mongo
     - edxapp
     - rabbitmq
     - oraclejdk

playbooks/edx_jenkins_tests.yml

@@ -23,6 +23,7 @@
       - xserver
       - ora
     - edxlocal
+    - mongo
     - edxapp
     - xqueue
     - xserver

playbooks/edx_provision_test.yml

@@ -34,6 +34,7 @@
       - xserver
       - xqueue
     - edxlocal
+    - mongo
     - edxapp
     - xqueue
     - xserver

playbooks/edx_sandbox.yml

@@ -30,6 +30,7 @@
       - lms-preview
       - ora
     - edxlocal
+    - mongo
     - edxapp
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - { role: 'edxapp', celery_worker: True }

playbooks/roles/edxlocal/tasks/main.yml

@@ -13,13 +13,6 @@
 - name: edxlocal| install packages needed for single server 
   apt: pkg={{','.join(edxlocal_debian_pkgs)}} install_recommends=yes state=present
 
-- name: edxlocal | install python pymongo for mongo_user ansible module
-  pip: >
-    name=pymongo 
-    state=present 
-    version=2.6.3
-    extra_args="-i {{ PYPI_MIRROR_URL }}"
-
 - name: edxlocal | create a database for edxapp
   mysql_db: >
     db=edxapp
@@ -38,52 +31,5 @@
     state=present
     encoding=utf8
 
-- name: edxlocal | add the mongodb signing key
-  apt_key: >
-    id=7F0CEB10
-    url=http://docs.mongodb.org/10gen-gpg-key.asc 
-    state=present
-
-- name: edxlocal | add the mongodb repo to the sources list
-  apt_repository: >
-    repo='deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen'
-    state=present
-
-- name: edxlocal | install mongo server and recommends
-  apt: >
-    pkg=mongodb-10gen 
-    state=present 
-    install_recommends=yes
-    update_cache=yes
-
-- name: edxlocal | stop mongo service
-  service: name=mongodb state=stopped
-
-- name: edxlocal | move mongodb to {{ storage_base_dir }}
-  command: mv /var/lib/mongodb  {{ storage_base_dir }}/.  creates={{ storage_base_dir }}/mongodb
-
-- name: edxlocal | create mongodb symlink
-  file: src={{ storage_base_dir }}/mongodb dest=/var/lib/mongodb state=link
-
-- name: edxlocal | start mongo service
-  service: name=mongodb state=started
-
-- name: edxlocal | wait for mongo server to start
-  wait_for: port=27017 delay=2
-
-- name: edxlocal | create a mongodb user for edxapp
-  mongodb_user: >
-    database=edxapp
-    name=edxapp
-    password=password
-    state=present
-
-- name: edxlocal | create a mongodb user for forums
-  mongodb_user: >
-    database=cs_comments_service
-    name=cs_comments_service
-    password=password
-    state=present
-
 - name: edxlocal | install memcached
   apt: pkg=memcached state=present

playbooks/roles/mongo/defaults/main.yml

-cs_comments_mongo_user: cs_comments_service
-cs_comments_mongo_password: password
-cs_comments_database: cs_comments_service
 mongo_dbpath: /var/lib/mongodb
 mongo_logpath: /var/log/mongodb/mongodb.log
 mongo_logappend: true
 mongo_bind_ip: 127.0.0.1
 mongo_extra_conf: ''
+
+MONGO_USERS:
+  - user: cs_comments_service
+    password: password
+    database: cs_comments_service
+  - user: exdapp
+    password: password
+    database: edxapp

playbooks/roles/mongo/tasks/main.yml

 
 ---
-- name: mongo | install python-pymongo (req for ansible)
-  pip: name=pymongo
+- name: mongo | install python pymongo for mongo_user ansible module
+  pip: >
+    name=pymongo
+    state=present
+    version=2.6.3
+    extra_args="-i {{ PYPI_MIRROR_URL }}"
   tags: mongo
 
+- name: mongo | add the mongodb signing key
+  apt_key: >
+    id=7F0CEB10
+    url=http://docs.mongodb.org/10gen-gpg-key.asc
+    state=present
+
+- name: mongo | add the mongodb repo to the sources list
+  apt_repository: >
+    repo='deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen'
+    state=present
+
 - name: mongo | install mongo server and recommends
-  apt: pkg=mongodb-server state=present install_recommends=yes
-  tags: mongo
+  apt: >
+    pkg=mongodb-10gen
+    state=present
+    install_recommends=yes
+    update_cache=yes
 
 - name: mongo | stop mongo service
   service: name=mongodb state=stopped
@@ -35,8 +53,9 @@
 
 - name: mongo | create a mongodb user
   mongodb_user: >
-    database={{ cs_comments_database }}
-    name={{ cs_comments_mongo_user }}
-    password={{ cs_comments_mongo_password }}
+    database={{ database }}
+    name={{ user }}
+    password={{ password }}
     state=present
+  with_items: {{MONGO_USERS}}
   tags: mongo

playbooks/vagrant-fullstack.yml

@@ -17,6 +17,7 @@
       - xserver
       - xqueue
     - edxlocal
+    - mongo
     - edxapp
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - { role: 'edxapp', celery_worker: True }

playbooks/vagrant-shortstack-xml.yml

@@ -15,4 +15,5 @@
       - cms
       - lms-preview
     - edxlocal
+    - mongo
     - { role: 'edxapp', EDXAPP_LMS_NGINX_PORT: 18030, EDXAPP_LMS_XML_NGINX_PORT: 80 }

playbooks/vagrant-shortstack.yml

@@ -15,6 +15,7 @@
       - cms
       - lms-preview
     - edxlocal
+    - mongo
     - edxapp
     - oraclejdk
     - elasticsearch