Merge pull request #3516 from edx/jibsheet/node-devstacks

Capture both kinds of node bin dirs

playbooks/roles/edxapp/defaults/main.yml

@@ -638,10 +638,12 @@ edxapp_venvs_dir: "{{ edxapp_app_dir }}/venvs"
 edxapp_venv_dir: "{{ edxapp_venvs_dir }}/edxapp"
 edxapp_venv_bin: "{{ edxapp_venv_dir }}/bin"
 edxapp_nodeenv_dir: "{{ edxapp_app_dir }}/nodeenvs/edxapp"
-edxapp_node_bin: "{{ edxapp_nodeenv_dir }}/bin"
+edxapp_nodeenv_bin: "{{ edxapp_nodeenv_dir }}/bin"
 edxapp_node_version: "0.10.37"
+# This is where node installs modules, not node itself
+edxapp_node_bin: "{{ edxapp_code_dir }}/node_modules/.bin"
 edxapp_user: edxapp
-edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_node_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+edxapp_deploy_path: "{{ edxapp_venv_bin }}:{{ edxapp_code_dir }}/bin:{{ edxapp_node_bin }}:{{ edxapp_nodeenv_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 edxapp_staticfile_dir: "{{ edxapp_data_dir }}/staticfiles"
 edxapp_media_dir: "{{ edxapp_data_dir }}/media"
 edxapp_course_static_dir: "{{ edxapp_data_dir }}/course_static"

playbooks/roles/edxapp/tasks/deploy.yml

@@ -244,7 +244,7 @@
 
 - name: install node dependencies
   npm:
-    executable: "{{ edxapp_node_bin }}/npm"
+    executable: "{{ edxapp_nodeenv_bin }}/npm"
     path: "{{ edxapp_code_dir }}"
     production: yes
   environment: "{{ edxapp_environment }}"