Merge pull request #345 from edx/feanil/update_integration

Feanil/update integration

playbooks/roles/edxapp/tasks/deploy.yml

@@ -201,6 +201,26 @@
 - name: changing group ownership to www-data for everything in the venv (workaround)
   shell: chgrp -R www-data {{ venv_dir }}
 
+- name: syncdb and migrate
+  shell: sudo -u www-data SERVICE_VARIANT=lms /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=lms.envs.aws --pythonpath=/opt/wwc/edx-platform
+  when: migrate_db is defined and migrate_db|lower == "yes"
+  tags:
+  - deploy
+  - lms
+  - lms-preview
+  - cms
+  - syncdb
+
+- name: db migrate
+  shell: sudo -u www-data SERVICE_VARIANT=lms /opt/edx/bin/django-admin.py migrate --noinput --settings=lms.envs.aws --pythonpath=/opt/wwc/edx-platform
+  when: migrate_only is defined and migrate_only|lower == "yes"
+  tags:
+  - deploy
+  - lms
+  - lms-preview
+  - cms
+  - migrate 
+
 
 # Gather lms assets using rake if possible
 - name: gather lms static assets with rake
@@ -244,26 +264,6 @@
   - cms
   - syncdb
 
-- name: syncdb and migrate
-  shell: sudo -u www-data SERVICE_VARIANT=lms /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=lms.envs.aws --pythonpath=/opt/wwc/edx-platform
-  when: migrate_db is defined and migrate_db|lower == "yes"
-  tags:
-  - deploy
-  - lms
-  - lms-preview
-  - cms
-  - syncdb
-
-- name: db migrate
-  shell: sudo -u www-data SERVICE_VARIANT=lms /opt/edx/bin/django-admin.py migrate --noinput --settings=lms.envs.aws --pythonpath=/opt/wwc/edx-platform
-  when: migrate_only is defined and migrate_only|lower == "yes"
-  tags:
-  - deploy
-  - lms
-  - lms-preview
-  - cms
-  - migrate 
-
 - name: restart edxapp
   service: name=edxapp state=restarted
   when: celery_worker is not defined

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