resolving merge conflicts, updating from master

playbooks/roles/edxapp/defaults/main.yml

@@ -120,6 +120,13 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
     basic_auth: $EDXAPP_XQUEUE_BASIC_AUTH
     django_auth: $EDXAPP_XQUEUE_DJANGO_AUTH
     url: $EDXAPP_XQUEUE_URL
+  DOC_STORE_CONFIG: &edxapp_generic_default_docstore
+    db: $EDXAPP_MONGO_DB_NAME
+    host: $EDXAPP_MONGO_HOSTS
+    password: $EDXAPP_MONGO_PASSWORD
+    port: $EDXAPP_MONGO_PORT
+    user: $EDXAPP_MONGO_USER
+    collection:  'modulestore'
   CONTENTSTORE:
     ENGINE:  'xmodule.contentstore.mongo.MongoContentStore'
     #
@@ -132,12 +139,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       password: $EDXAPP_MONGO_PASSWORD
       port: $EDXAPP_MONGO_PORT
       user: $EDXAPP_MONGO_USER
-    DOC_STORE_CONFIG:
-      db: $EDXAPP_MONGO_DB_NAME
-      host: $EDXAPP_MONGO_HOSTS
-      password: $EDXAPP_MONGO_PASSWORD
-      port: $EDXAPP_MONGO_PORT
-      user: $EDXAPP_MONGO_USER
+    DOC_STORE_CONFIG: *edxapp_generic_default_docstore
   MODULESTORE:
     default: &edxapp_generic_default_modulestore
       ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
@@ -152,13 +154,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
         render_template:  'mitxmako.shortcuts.render_to_string'
         # Needed for the CMS to be able to run update_templates
         user: $EDXAPP_MONGO_USER
-      DOC_STORE_CONFIG: &edxapp_generic_default_docstore
-        db: $EDXAPP_MONGO_DB_NAME
-        host: $EDXAPP_MONGO_HOSTS
-        password: $EDXAPP_MONGO_PASSWORD
-        port: $EDXAPP_MONGO_PORT
-        user: $EDXAPP_MONGO_USER
-        collection:  'modulestore'
+      DOC_STORE_CONFIG: *edxapp_generic_default_docstore
     direct: &edxapp_generic_direct_modulestore
       ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
       OPTIONS:  *generic_modulestore_default_options

playbooks/roles/edxlocal/defaults/main.yml

@@ -3,3 +3,4 @@ edxlocal_debian_pkgs:
   - python-mysqldb
   - mysql-server-5.5
   - postfix 
+  - python-pycurl

util/jenkins/ansible-deploy.sh

@@ -50,6 +50,8 @@ ease_version: $ease_version
 ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
 PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
 GIT_MIRROR: 'git.edx.org'
+
+migrate_only: '$run_migration'
 EOF
 
 cat $extra_vars