Merge pull request #2636 from edx/renzo/programs-nodeenv-path

Include nodeenv in the PATH used when installing node dependencies

playbooks/roles/programs/defaults/main.yml

@@ -95,11 +95,6 @@ PROGRAMS_GUNICORN_WORKER_CLASS: "gevent"
 programs_role_name: programs
 programs_venv_dir: "{{ programs_home }}/venvs/{{ programs_service_name }}"
 
-programs_environment:
-  DJANGO_SETTINGS_MODULE: "{{ PROGRAMS_DJANGO_SETTINGS_MODULE }}"
-  PROGRAMS_CFG: "{{ COMMON_CFG_DIR }}/{{ programs_service_name }}.yml"
-  PATH: "{{ programs_venv_dir }}/bin:{{ ansible_env.PATH }}"
-
 programs_service_name: "programs"
 programs_user: "{{ programs_service_name }}"
 programs_home: "{{ COMMON_APP_DIR }}/{{ programs_service_name }}"
@@ -110,6 +105,11 @@ programs_nodeenv_bin: "{{ programs_nodeenv_dir }}/bin"
 programs_node_modules_dir: "{{ programs_code_dir }}/node_modules"
 programs_node_bin: "{{ programs_node_modules_dir }}/.bin"
 
+programs_environment:
+  DJANGO_SETTINGS_MODULE: "{{ PROGRAMS_DJANGO_SETTINGS_MODULE }}"
+  PROGRAMS_CFG: "{{ COMMON_CFG_DIR }}/{{ programs_service_name }}.yml"
+  PATH: "{{ programs_nodeenv_bin }}:{{ programs_venv_dir }}/bin:{{ ansible_env.PATH }}"
+
 programs_gunicorn_host: "127.0.0.1"
 programs_gunicorn_port: 8140
 programs_gunicorn_timeout: 300

playbooks/roles/programs/tasks/main.yml

@@ -44,6 +44,7 @@
 - name: install node dependencies
   npm: executable={{ programs_nodeenv_bin }}/npm path={{ programs_code_dir }} production=yes
   sudo_user: "{{ programs_user }}"
+  environment: "{{ programs_environment }}"
 
 - name: install bower dependencies
   shell: >
@@ -64,7 +65,7 @@
 - name: compile sass
   shell: >
     chdir={{ programs_code_dir }}
-    . {{ programs_nodeenv_bin }}/activate && npm rebuild node-sass && {{ programs_node_bin }}/gulp css
+    . {{ programs_nodeenv_bin }}/activate && {{ programs_node_bin }}/gulp css
   sudo_user: "{{ programs_user }}"
   when: not devstack