Commit 6eb3a9f9 by Edward Zarecor

Source nodeenv before running npm

the extra e is for extra
parent eadf4f30
...@@ -205,7 +205,7 @@ ecommerce_requirements: ...@@ -205,7 +205,7 @@ ecommerce_requirements:
ecommerce_environment: ecommerce_environment:
DJANGO_SETTINGS_MODULE: "{{ ECOMMERCE_DJANGO_SETTINGS_MODULE }}" DJANGO_SETTINGS_MODULE: "{{ ECOMMERCE_DJANGO_SETTINGS_MODULE }}"
ECOMMERCE_CFG: "{{ COMMON_CFG_DIR }}/{{ ecommerce_service_name }}.yml" ECOMMERCE_CFG: "{{ COMMON_CFG_DIR }}/{{ ecommerce_service_name }}.yml"
PATH: "{{ ecommerce_venv_dir }}/bin:{{ ansible_env.PATH }}" PATH: "{{ ecommerce_nodeenv_bin }}:{{ ecommerce_venv_dir }}/bin:{{ ansible_env.PATH }}"
# #
# OS packages # OS packages
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
- name: install node dependencies - name: install node dependencies
npm: executable={{ ecommerce_nodeenv_bin }}/npm path={{ ecommerce_code_dir }} production=yes npm: executable={{ ecommerce_nodeenv_bin }}/npm path={{ ecommerce_code_dir }} production=yes
sudo_user: "{{ ecommerce_user }}" sudo_user: "{{ ecommerce_user }}"
environment: "{{ ecommerce_environment }}"
- name: install bower dependencies - name: install bower dependencies
shell: > shell: >
......
...@@ -150,8 +150,11 @@ INSIGHTS_REPOS: ...@@ -150,8 +150,11 @@ INSIGHTS_REPOS:
insights_environment: insights_environment:
DJANGO_SETTINGS_MODULE: "analytics_dashboard.settings.production" DJANGO_SETTINGS_MODULE: "analytics_dashboard.settings.production"
ANALYTICS_DASHBOARD_CFG: "{{ COMMON_CFG_DIR }}/{{ insights_service_name }}.yml" ANALYTICS_DASHBOARD_CFG: "{{ COMMON_CFG_DIR }}/{{ insights_service_name }}.yml"
PATH: "{{ insights_nodeenv_bin }}:{{ insights_venv_dir }}/bin:{{ ansible_env.PATH }}"
insights_service_name: insights insights_service_name: insights
insights_venv_dir: "{{ insights_home }}/venvs/{{ insights_service_name }}"
insights_user: "{{ insights_service_name }}" insights_user: "{{ insights_service_name }}"
insights_app_dir: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}" insights_app_dir: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}"
insights_home: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}" insights_home: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
- name: install application requirements - name: install application requirements
pip: > pip: >
requirements="{{ insights_requirements_base }}/{{ item }}" requirements="{{ insights_requirements_base }}/{{ item }}"
virtualenv="{{ insights_home }}/venvs/{{ insights_service_name }}" virtualenv="{{ insights_venv_dir }}"
state=present extra_args="--exists-action w" state=present extra_args="--exists-action w"
sudo_user: "{{ insights_user }}" sudo_user: "{{ insights_user }}"
with_items: insights_requirements with_items: insights_requirements
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
- name: create nodeenv - name: create nodeenv
shell: > shell: >
creates={{ insights_nodeenv_dir }} creates={{ insights_nodeenv_dir }}
{{ insights_home }}/venvs/{{ insights_service_name }}/bin/nodeenv {{ insights_nodeenv_dir }} --prebuilt {{ insights_venv_dir }}/bin/nodeenv {{ insights_nodeenv_dir }} --prebuilt
sudo_user: "{{ insights_user }}" sudo_user: "{{ insights_user }}"
tags: tags:
- install - install
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
tags: tags:
- install - install
- install:app-requirements - install:app-requirements
environment: "{{ insights_environment }}"
- name: install bower dependencies - name: install bower dependencies
shell: > shell: >
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
chdir={{ insights_code_dir }} chdir={{ insights_code_dir }}
DB_MIGRATION_USER='{{ COMMON_MYSQL_MIGRATE_USER }}' DB_MIGRATION_USER='{{ COMMON_MYSQL_MIGRATE_USER }}'
DB_MIGRATION_PASS='{{ COMMON_MYSQL_MIGRATE_PASS }}' DB_MIGRATION_PASS='{{ COMMON_MYSQL_MIGRATE_PASS }}'
{{ insights_home }}/venvs/{{ insights_service_name }}/bin/python {{ insights_manage }} migrate --noinput {{ insights_venv_dir }}/bin/python {{ insights_manage }} migrate --noinput
sudo_user: "{{ insights_user }}" sudo_user: "{{ insights_user }}"
environment: "{{ insights_environment }}" environment: "{{ insights_environment }}"
when: migrate_db is defined and migrate_db|lower == "yes" when: migrate_db is defined and migrate_db|lower == "yes"
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
- name: run collectstatic - name: run collectstatic
shell: > shell: >
chdir={{ insights_code_dir }} chdir={{ insights_code_dir }}
{{ insights_home }}/venvs/{{ insights_service_name }}/bin/python {{ insights_manage }} {{ item }} {{ insights_venv_dir }}/bin/python {{ insights_manage }} {{ item }}
sudo_user: "{{ insights_user }}" sudo_user: "{{ insights_user }}"
environment: "{{ insights_environment }}" environment: "{{ insights_environment }}"
with_items: with_items:
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
- name: compile translations - name: compile translations
shell: > shell: >
chdir={{ insights_code_dir }}/analytics_dashboard chdir={{ insights_code_dir }}/analytics_dashboard
. {{ insights_home }}/venvs/{{ insights_service_name }}/bin/activate && i18n_tool generate -v . {{ insights_venv_dir }}/bin/activate && i18n_tool generate -v
sudo_user: "{{ insights_user }}" sudo_user: "{{ insights_user }}"
tags: tags:
- assets - assets
...@@ -150,7 +151,7 @@ ...@@ -150,7 +151,7 @@
- name: create symlinks from the venv bin dir - name: create symlinks from the venv bin dir
file: > file: >
src="{{ insights_home }}/venvs/{{ insights_service_name }}/bin/{{ item }}" src="{{ insights_venv_dir }}/bin/{{ item }}"
dest="{{ COMMON_BIN_DIR }}/{{ item.split('.')[0] }}.{{ insights_service_name }}" dest="{{ COMMON_BIN_DIR }}/{{ item.split('.')[0] }}.{{ insights_service_name }}"
state=link state=link
with_items: with_items:
......
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