Merge pull request #1974 from edx/feanil/connect_clone_bugfix

Feanil/connect clone bugfix

playbooks/edx-east/connect_sandbox.yml

@@ -36,5 +36,5 @@
 
     - name: call update on edx-platform
       shell: >
-        /edx/bin/update edx-platform master
+        /edx/bin/update edx-platform {{ edxapp_version }}
       tags: update_edxapp_mysql_host

util/jenkins/ansible-provision.sh

@@ -260,8 +260,7 @@ fi
 
 # deploy the edx_ansible role
 run_ansible edx_ansible.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
-cat $extra_vars_file | grep -v "_version" > ${extra_vars_file}_clean
-cat ${extra_vars_file}_clean
+cat $extra_vars_file | grep -v -E "_version|migrate_db" | tee ${extra_vars_file}_clean
 ansible -c ssh -i "${deploy_host}," $deploy_host -m copy -a "src=${extra_vars_file}_clean dest=/edx/app/edx_ansible/server-vars.yml" -u ubuntu -b
 ret=$?
 if [[ $ret -ne 0 ]]; then

util/jenkins/connect-sandbox-to-prod-clone.sh

@@ -38,4 +38,4 @@ if [[ -z $sandbox_to_update ]]; then
 fi
 
 cd $WORKSPACE/configuration/playbooks/edx-east
-ansible-playbook connect_sandbox.yml  -i $sandbox_to_update, -e@${WORKSPACE}/configuration-secure/ansible/vars/clone-db.yml -e EDXAPP_MYSQL_HOST=$EDXAPP_MYSQL_HOST --user ubuntu  -v
+ansible-playbook connect_sandbox.yml  -i $sandbox_to_update, -e@${WORKSPACE}/configuration-secure/ansible/vars/clone-db.yml -e EDXAPP_MYSQL_HOST=$EDXAPP_MYSQL_HOST -e edxapp_version=${edxapp_version} --user ubuntu  -v