From dfc83669b6176e3af4d3f3dc0b3ff9779596fb73 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Fri, 4 Dec 2015 11:32:08 -0500
Subject: [PATCH] Use ansible_env.PATH instead of ${PATH}
---
playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2 | 2 +-
playbooks/roles/course_discovery/defaults/main.yml | 2 +-
playbooks/roles/ecommerce/defaults/main.yml | 2 +-
playbooks/roles/programs/defaults/main.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2 b/playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2
index a585fc4..babdcc3 100644
--- a/playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2
+++ b/playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2
@@ -106,7 +106,7 @@ nginx_{{ role_name }}_gunicorn_hosts:
{{ role_name }}_environment:
DJANGO_SETTINGS_MODULE: "{{ '{{' }} {{ role_name|upper }}_DJANGO_SETTINGS_MODULE }}"
{{ role_name|upper }}_CFG: "{{ '{{' }} COMMON_CFG_DIR }}/{{ '{{' }} {{ role_name }}_service_name }}.yml"
- PATH: "{{ '{{' }} {{ role_name|lower }}_venv_dir }}/bin:${PATH}"
+ PATH: "{{ '{{' }} {{ role_name|lower }}_venv_dir }}/bin:{{ ansible_env.PATH }}"
{{ role_name }}_service_name: "{{ role_name }}"
{{ role_name }}_user: "{{ '{{' }} {{ role_name }}_service_name }}"
diff --git a/playbooks/roles/course_discovery/defaults/main.yml b/playbooks/roles/course_discovery/defaults/main.yml
index 5c17153..95ca8bc 100644
--- a/playbooks/roles/course_discovery/defaults/main.yml
+++ b/playbooks/roles/course_discovery/defaults/main.yml
@@ -113,7 +113,7 @@ course_discovery_venv_dir: "{{ course_discovery_home }}/venvs/{{ course_discover
course_discovery_environment:
DJANGO_SETTINGS_MODULE: "{{ COURSE_DISCOVERY_DJANGO_SETTINGS_MODULE }}"
COURSE_DISCOVERY_CFG: "{{ COMMON_CFG_DIR }}/{{ course_discovery_service_name }}.yml"
- PATH: "{{ course_discovery_venv_dir }}/bin:${PATH}"
+ PATH: "{{ course_discovery_venv_dir }}/bin:{{ ansible_env.PATH }}"
course_discovery_service_name: "course_discovery"
course_discovery_user: "{{ course_discovery_service_name }}"
diff --git a/playbooks/roles/ecommerce/defaults/main.yml b/playbooks/roles/ecommerce/defaults/main.yml
index e8ece56..8ee5def 100644
--- a/playbooks/roles/ecommerce/defaults/main.yml
+++ b/playbooks/roles/ecommerce/defaults/main.yml
@@ -195,7 +195,7 @@ ecommerce_requirements:
ecommerce_environment:
DJANGO_SETTINGS_MODULE: "{{ ECOMMERCE_DJANGO_SETTINGS_MODULE }}"
ECOMMERCE_CFG: "{{ COMMON_CFG_DIR }}/{{ ecommerce_service_name }}.yml"
- PATH: "{{ ecommerce_venv_dir }}/bin:${PATH}"
+ PATH: "{{ ecommerce_venv_dir }}/bin:{{ ansible_env.PATH }}"
#
# OS packages
diff --git a/playbooks/roles/programs/defaults/main.yml b/playbooks/roles/programs/defaults/main.yml
index ac31f3e..34b7cae 100644
--- a/playbooks/roles/programs/defaults/main.yml
+++ b/playbooks/roles/programs/defaults/main.yml
@@ -93,7 +93,7 @@ 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:${PATH}"
+ PATH: "{{ programs_venv_dir }}/bin:{{ ansible_env.PATH }}"
programs_service_name: "programs"
programs_user: "{{ programs_service_name }}"
--
libgit2 0.26.0