Merge branch 'master' into 2013-search-all-the-things-TC

[arvados.git] / doc / install / install-crunch-dispatch.html.textile.liquid

diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 893a8aad9a5279e991d046c0ec95642e03e02fa0..f8cc14321cdb3f9763a287333e56497eb4d67230 100644 (file)
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -18,7 +18,7 @@ h4. Python SDK dependencies
 On controller and all compute nodes:
 
 * @apt-get install python-pip@
-* @pip install --upgrade google-api-python-client@
+* @pip install --upgrade virtualenv arvados-python-client@
 
 h4. Likely crunch job dependencies
 
@@ -54,7 +54,7 @@ set -e
 while sleep 60
 do
   cd /path/to/arvados/services/api
-  setuidgid www-data env RAILS_ENV=production /usr/local/rvm/bin/rvm 2.0.0 do bundle exec ./script/import_commits.rb 2>&1
+  setuidgid www-data env RAILS_ENV=production /usr/local/rvm/bin/rvm-exec 2.0.0 bundle exec ./script/import_commits.rb 2>&1
 done
 </pre>
 
@@ -89,7 +89,6 @@ set -e
 export PATH="$PATH":/path/to/arvados/services/crunch
 export PERLLIB=/path/to/arvados/sdk/perl/lib:/path/to/warehouse-apps/libwarehouse-perl/lib
 export ARVADOS_API_HOST={{ site.arvados_api_host }}
-export PYTHONPATH=/path/to/arvados/src/sdk/python
 export CRUNCH_DISPATCH_LOCKFILE=/var/lock/crunch-dispatch
 
 fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
@@ -98,5 +97,6 @@ fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
 # export ARVADOS_API_HOST_INSECURE=yes
 
 cd /path/to/arvados/services/api
-RAILS_ENV=production /usr/local/rvm/bin/rvm 2.0.0 do bundle exec ./script/crunch-dispatch.rb 2>&1
+export RAILS_ENV=production
+exec /usr/local/rvm/bin/rvm-exec 2.0.0 bundle exec ./script/crunch-dispatch.rb 2>&1
 </pre>