Merge pull request #322 from edx/jarv/new-mongo

Jarv/new mongo

playbooks/roles/edxapp/defaults/main.yml

@@ -293,77 +293,34 @@ sandbox_post_requirements:  "{{ edx_platform_code_dir }}/requirements/edx-sandbo
 install_sandbox_reqs_into_regular_venv: true
 
 lms_debian_pkgs:
-  - apparmor-utils
-  - aspell
+  # for compiling the virtualenv
+  # (only needed if wheel files aren't available)
   - build-essential
-  - curl
-  - dvipng
-  - fabric
-  - g++
-  - gcc
-  - gfortran
-  - ghostscript
-  - github-cli
-  - graphviz
+  - s3cmd
+  - pkg-config
   - graphviz-dev
-  - gunicorn
-  - inoticoming
-  - ipython
-  - libcrypt-ssleay-perl
-  - libcurl4-openssl-dev
-  - libdigest-sha-perl
-  - libfreetype6-dev
-  - libgeos-dev
-  - libgraphviz-dev
-  - libjpeg8-dev
-  - liblapack-dev
-  - liblwp-protocol-https-perl
+  - graphviz
   - libmysqlclient-dev
-  - libnet-amazon-ec2-perl
-  - libpng12-dev
-  - libreadline-dev
-  - libreadline6-dev
-  - libssl-dev
-  - libswitch-perl
-  - libwww-perl
-  - libxml++2.6-dev
+  # for scipy, do not install
+  # libopenblas-base, it will cause
+  # problems for numpy
+  - gfortran 
+  - libatlas3gf-base
+  - liblapack-dev
+  - g++
   - libxml2-dev
-  - libxml2-utils
   - libxslt1-dev
-  - lynx-cur
-  - maven2
-  - mongodb-clients
-  - mysql-client
+  # apparmor
+  - apparmor-utils
+  # misc
+  - curl
+  - ipython
   - npm
   - ntp
-  - openjdk-7-jdk
-  - openjdk-7-jre
-  - pep8
-  - perl
-  - pkg-config
-  - postfix
-  - pylint
-  - python-boto
-  - python-coverage-test-runner
-  - python-django-nose
-  - python-jenkins
-  - python-nose
-  - python-nosexcover
-  - python-numpy
-  - python-pip
-  - python-scipy
-  - rake
-  - reprepro
-  - rsyslog
-  - rubygems
-  - sqlite3
-  - super
-  - vagrant
-  - yui-compressor
-  - zip
-  - zlib1g-dev
-
-# Ruby Specific Vars
+  # for shapely
+  - libgeos-dev
+
+# R by Specific Vars
 ruby_base: /opt/www
 rbenv_root: "{{ ruby_base }}/.rbenv"
 ruby_version: "1.9.3-p374"

playbooks/roles/edxlocal/tasks/main.yml

@@ -38,8 +38,23 @@
     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-server state=present install_recommends=yes
+  apt: >
+    pkg=mongodb-10gen 
+    state=present 
+    install_recommends=yes
+    update_cache=yes
 
 - name: edxlocal | stop mongo service
   service: name=mongodb state=stopped

playbooks/roles/xqueue/defaults/main.yml

@@ -76,75 +76,22 @@ xqueue_post_requirements_file:   "{{ xqueue_code_dir }}/requirements.txt"
 # copied from the LMS role for now since there is a lot
 # of overlap
 xqueue_debian_pkgs:
-  - apparmor-utils
-  - aspell
+  # for compiling the virtualenv
+  # (only needed if wheel files aren't available)
   - build-essential
-  - curl
-  - dvipng
-  - fabric
-  - g++
-  - gcc
-  - gfortran
-  - ghostscript
-  - git
-  - github-cli
-  - graphviz
+  - s3cmd
+  - pkg-config
   - graphviz-dev
-  - gunicorn
-  - inoticoming
-  - ipython
-  - libcrypt-ssleay-perl
-  - libcurl4-openssl-dev
-  - libdigest-sha-perl
-  - libfreetype6-dev
-  - libgeos-dev
-  - libgraphviz-dev
-  - libjpeg8-dev
-  - liblapack-dev
-  - liblwp-protocol-https-perl
+  - graphviz
   - libmysqlclient-dev
-  - libnet-amazon-ec2-perl
-  - libpng12-dev
-  - libreadline-dev
-  - libreadline6-dev
-  - libssl-dev
-  - libswitch-perl
-  - libwww-perl
-  - libxml++2.6-dev
-  - libxml2-dev
-  - libxml2-utils
-  - libxslt1-dev
-  - maven2
-  - mongodb-clients
-  - mysql-client
+  # apparmor
+  - apparmor-utils
+  # misc
+  - curl
+  - ipython
   - npm
   - ntp
-  - openjdk-7-jdk
-  - openjdk-7-jre
-  - pep8
-  - perl
-  - pkg-config
-  - postfix
-  - pylint
-  - python-boto
-  - python-coverage-test-runner
-  - python-django-nose
-  - python-jenkins
-  - python-nose
-  - python-nosexcover
-  - python-numpy
-  - python-pip
-  - python-scipy
-  - python-mysqldb
-  - rake
-  - reprepro
-  - rsyslog
-  - rubygems
-  - sqlite3
-  - super
-  - vagrant
-  - yui-compressor
-  - zip
-  - zlib1g-dev
+  # for shapely
+  - libgeos-dev
   # Needed to be able to create the xqueue mysqldb.
   - python-mysqldb

util/jenkins/ansible-provision.sh

@@ -20,6 +20,16 @@
 
 export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
 
+function ascii_convert {
+  echo $1 | iconv -f utf8 -t ascii//TRANSLIT//IGNORE
+}
+
+# remove non-ascii chars from build user vars
+BUILD_USER_LAST_NAME=$(ascii_convert $BUILD_USER_LAST_NAME)
+BUILD_USER_FIRST_NAME=$(ascii_convert $BUILD_USER_FIRST_NAME)
+BUILD_USER_ID=$(ascii_convert $BUILD_USER_ID)
+BUILD_USER=$(ascii_convert $BUILD_USER)
+
 if [[ -z $github_username  ]]; then
   github_username=$BUILD_USER_ID
 fi