Update worker killing logic and re-order playbook.

playbooks/vagrant-fullstack.yml

@@ -29,8 +29,8 @@
       - cms
     - edxlocal
     - mongo
-    - { role: 'edxapp', celery_worker: True }
     - edxapp
+    - { role: 'edxapp', celery_worker: True }
     - demo
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - oraclejdk

util/vagrant/migrate.sh

@@ -106,13 +106,14 @@ EOM
   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 2
+    sleep 3
     sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
-    sleep 2
+    sleep 3
     sudo pgrep -lf celery | grep worker | awk '{ print $1}' | sudo xargs -I {} kill -9 {}
-    sleep 2
+    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