Commit 04f918de by Feanil Patel

Merge pull request #2205 from edx/feanil/merge_cypress_into_master

Feanil/merge cypress into master
parents ffd28db5 66026481
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
- forum - forum
- { role: notifier, NOTIFIER_DIGEST_TASK_INTERVAL: "5" } - { role: notifier, NOTIFIER_DIGEST_TASK_INTERVAL: "5" }
- { role: "xqueue", update_users: True } - { role: "xqueue", update_users: True }
- xqwatcher
- role: ora - role: ora
when: ENABLE_LEGACY_ORA when: ENABLE_LEGACY_ORA
- certs - certs
......
...@@ -39,6 +39,10 @@ edx_ansible_venv_bin: "{{ edx_ansible_venv_dir }}/bin" ...@@ -39,6 +39,10 @@ edx_ansible_venv_bin: "{{ edx_ansible_venv_dir }}/bin"
edx_ansible_user: "edx-ansible" edx_ansible_user: "edx-ansible"
edx_ansible_source_repo: https://github.com/edx/configuration.git edx_ansible_source_repo: https://github.com/edx/configuration.git
edx_ansible_requirements_file: "{{ edx_ansible_code_dir }}/requirements.txt" edx_ansible_requirements_file: "{{ edx_ansible_code_dir }}/requirements.txt"
edx_ansible_requirements_files:
- "{{ edx_ansible_code_dir }}/pre-requirements.txt"
- "{{ edx_ansible_code_dir }}/requirements.txt"
# edX configuration repo # edX configuration repo
configuration_version: release configuration_version: release
edx_ansible_var_file: "{{ edx_ansible_app_dir }}/server-vars.yml" edx_ansible_var_file: "{{ edx_ansible_app_dir }}/server-vars.yml"
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
requirements="{{ edx_ansible_requirements_file }}" virtualenv="{{ edx_ansible_venv_dir }}" state=present requirements="{{ edx_ansible_requirements_file }}" virtualenv="{{ edx_ansible_venv_dir }}" state=present
extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}" extra_args="-i {{ COMMON_PYPI_MIRROR_URL }}"
sudo_user: "{{ edx_ansible_user }}" sudo_user: "{{ edx_ansible_user }}"
with_items: "{{ edx_ansible_requirements_files }}"
- name: create update script - name: create update script
template: > template: >
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
- cms - cms
- edxlocal - edxlocal
- mongo - mongo
- { role: 'edxapp', celery_worker: True }
- edxapp - edxapp
- { role: 'edxapp', celery_worker: True }
- demo - demo
- { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' } - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
- oraclejdk - oraclejdk
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
# defaults # defaults
CONFIGURATION="fullstack" CONFIGURATION="fullstack"
TARGET="named-release/birch.2" TARGET="named-release/cypress.rc"
INTERACTIVE=true INTERACTIVE=true
OPENEDX_ROOT="/edx"
read -d '' HELP_TEXT <<- EOM read -d '' HELP_TEXT <<- EOM
Attempts to migrate your Open edX installation to a different release. Attempts to migrate your Open edX installation to a different release.
...@@ -15,6 +16,9 @@ Attempts to migrate your Open edX installation to a different release. ...@@ -15,6 +16,9 @@ Attempts to migrate your Open edX installation to a different release.
Migrate to the given git ref. Defaults to \"$TARGET\" Migrate to the given git ref. Defaults to \"$TARGET\"
-y -y
Run in non-interactive mode (reply \"yes\" to all questions) Run in non-interactive mode (reply \"yes\" to all questions)
-r OPENEDX_ROOT
The root directory under which all Open edX applications are installed.
Defaults to \"$OPENEDX_ROOT\"
-h -h
Show this help and exit. Show this help and exit.
EOM EOM
...@@ -35,6 +39,9 @@ while getopts "hc:t:y" opt; do ...@@ -35,6 +39,9 @@ while getopts "hc:t:y" opt; do
y) y)
INTERACTIVE=false INTERACTIVE=false
;; ;;
r)
OPENEDX_ROOT=$OPTARG
;;
esac esac
done done
...@@ -70,21 +77,54 @@ EOM ...@@ -70,21 +77,54 @@ EOM
fi fi
fi fi
if [[ $TARGET == *cypress* && $INTERACTIVE == true ]] ; then
cat <<"EOM"
WARNING WARNING WARNING WARNING WARNING
Due to the changes introduced between Birch and Cypress, you may encounter
some problems in this migration. If so, check this webpage for solutions:
https://openedx.atlassian.net/wiki/display/OpenOPS/Potential+Problems+Migrating+from+Birch+to+Cypress
Do you wish to proceed?
EOM
read input
if [ "$input" != "yes" -a "$input" != "y" ]; then
echo "Quitting"
exit 1
else
echo "Killing all celery worker processes."
sudo ${OPENEDX_ROOT}/bin/supervisorctl stop edxapp_worker:* &
sleep 3
# Supervisor restarts the process a couple of times so we have to kill it multiple times.
sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
sleep 3
sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
sleep 3
sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
sleep 3
sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
sudo -u forum git -C ${OPENEDX_ROOT}/app/forum/.rbenv reset --hard
fi
fi
if [ -f /edx/app/edx_ansible/server-vars.yml ]; then if [ -f /edx/app/edx_ansible/server-vars.yml ]; then
SERVER_VARS="--extra-vars=\"@/edx/app/edx_ansible/server-vars.yml\"" SERVER_VARS="--extra-vars=\"@${OPENEDX_ROOT}/app/edx_ansible/server-vars.yml\""
fi fi
TEMPDIR=`mktemp -d` TEMPDIR=`mktemp -d`
chmod 777 $TEMPDIR chmod 777 $TEMPDIR
cd $TEMPDIR cd $TEMPDIR
git clone https://github.com/edx/configuration.git --depth=1 --single-branch --branch=$TARGET git clone https://github.com/edx/configuration.git --depth=1 --single-branch --branch=$TARGET
virtualenv venv
source venv/bin/activate
pip install -r configuration/requirements.txt
echo "edx_platform_version: $TARGET" >> vars.yml echo "edx_platform_version: $TARGET" >> vars.yml
echo "ora2_version: $TARGET" >> vars.yml echo "ora2_version: $TARGET" >> vars.yml
echo "certs_version: $TARGET" >> vars.yml echo "certs_version: $TARGET" >> vars.yml
echo "forum_version: $TARGET" >> vars.yml echo "forum_version: $TARGET" >> vars.yml
echo "xqueue_version: $TARGET" >> vars.yml echo "xqueue_version: $TARGET" >> vars.yml
cd configuration/playbooks cd configuration/playbooks
sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook \ sudo ansible-playbook \
--inventory-file=localhost, \ --inventory-file=localhost, \
--connection=local \ --connection=local \
--extra-vars=\"@../../vars.yml\" \ --extra-vars=\"@../../vars.yml\" \
...@@ -96,5 +136,5 @@ if [ $exitcode != 0 ]; then ...@@ -96,5 +136,5 @@ if [ $exitcode != 0 ]; then
exit $exitcode; exit $exitcode;
fi fi
cd / cd /
rm -rf $TEMPDIR sudo rm -rf $TEMPDIR
echo "Migration complete. Please reboot your machine." echo "Migration complete. Please reboot your machine."
...@@ -119,6 +119,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -119,6 +119,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if ENV['OPENEDX_RELEASE'] if ENV['OPENEDX_RELEASE']
ansible.extra_vars = { ansible.extra_vars = {
edx_platform_version: ENV['OPENEDX_RELEASE'], edx_platform_version: ENV['OPENEDX_RELEASE'],
configuration_version: ENV['OPENEDX_RELEASE'],
certs_version: ENV['OPENEDX_RELEASE'], certs_version: ENV['OPENEDX_RELEASE'],
forum_version: ENV['OPENEDX_RELEASE'], forum_version: ENV['OPENEDX_RELEASE'],
xqueue_version: ENV['OPENEDX_RELEASE'], xqueue_version: ENV['OPENEDX_RELEASE'],
......
...@@ -36,6 +36,9 @@ openedx_releases = { ...@@ -36,6 +36,9 @@ openedx_releases = {
"named-release/birch.2" => { "named-release/birch.2" => {
:name => "birch-fullstack-2", :file => "birch-2-fullstack.box", :name => "birch-fullstack-2", :file => "birch-2-fullstack.box",
}, },
"named-release/cypress.rc2" => {
:name => "cypress-fullstack-rc2", :file => "20150720-cypress-fullstack-rc2.box",
},
"named-release/cypress.rc3" => { "named-release/cypress.rc3" => {
:name => "cypress-fullstack-rc3", :file => "20150724-cypress-fullstack-rc3.box", :name => "cypress-fullstack-rc3", :file => "20150724-cypress-fullstack-rc3.box",
}, },
......
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