Commit a2c10c77 by John Jarvis

updating from master, resolving merge conflicts

parents 44610a8b f3be2e6d
......@@ -19,6 +19,7 @@
- cms
- lms-preview
- edxlocal
- mongo
- edxapp
- rabbitmq
- oraclejdk
......
......@@ -23,6 +23,7 @@
- xserver
- ora
- edxlocal
- mongo
- edxapp
- xqueue
- xserver
......
......@@ -34,6 +34,7 @@
- xserver
- xqueue
- edxlocal
- mongo
- edxapp
- xqueue
- xserver
......
......@@ -30,6 +30,7 @@
- lms-preview
- ora
- edxlocal
- mongo
- edxapp
- { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
- { role: 'edxapp', celery_worker: True }
......
......@@ -25,7 +25,7 @@ EDXAPP_XQUEUE_DJANGO_AUTH:
EDXAPP_MONGO_HOSTS: ['localhost']
EDXAPP_MONGO_PASSWORD: 'password'
EDXAPP_MONGO_PORT: 27017
EDXAPP_MONGO_USER: 'mongo'
EDXAPP_MONGO_USER: 'edxapp'
EDXAPP_MONGO_DB_NAME: 'edxapp'
EDXAPP_MYSQL_DB_NAME: 'edxapp'
......
......@@ -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,40 +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 | wait for mongo server to start
wait_for: port=27017
- 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
......@@ -84,7 +84,7 @@ def update_repos():
run_cmd('git clone --mirror {} {}'.format(repo['html_url'], repo_path))
run_cmd('cd {} && git update-server-info'.format(repo_path))
else:
run_cmd('cd {} && git remote-update'.format(repo_path))
run_cmd('cd {} && git fetch --all --tags'.format(repo_path))
run_cmd('cd {} && git update-server-info'.format(repo_path))
if __name__ == '__main__':
......
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_version: 2.4.7
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
---
- 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={{ mongo_version }}
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={{ item.database }}
name={{ item.user }}
password={{ item.password }}
state=present
with_items: MONGO_USERS
tags: mongo
......@@ -25,7 +25,7 @@ XQUEUE_QUEUES:
'certificates': !!null
'open-ended': !!null
XQUEUE_LOGGING_ENV: sandbox
XQUEUE_SYSLOG_SERVER: 'syslog.a.m.i4x.org'
XQUEUE_SYSLOG_SERVER: 'localhost'
XQUEUE_S3_BUCKET : 'sandbox-bucket'
XQUEUE_S3_PATH_PREFIX: 'sandbox-xqueue'
XQUEUE_LOCAL_LOGLEVEL: 'INFO'
......
......@@ -17,6 +17,7 @@
- xserver
- xqueue
- edxlocal
- mongo
- edxapp
- { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
- { role: 'edxapp', celery_worker: True }
......
......@@ -15,4 +15,5 @@
- cms
- lms-preview
- edxlocal
- mongo
- { role: 'edxapp', EDXAPP_LMS_NGINX_PORT: 18030, EDXAPP_LMS_XML_NGINX_PORT: 80 }
......@@ -15,6 +15,7 @@
- cms
- lms-preview
- edxlocal
- mongo
- edxapp
- oraclejdk
- elasticsearch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment