From 7300302287247c0435bce48c9e4414812e2749dd Mon Sep 17 00:00:00 2001
From: Geoff Jacobs <gjacobs@atlassian.com>
Date: Fri, 11 Aug 2023 09:10:07 +1000
Subject: [PATCH] changing where we set the ansible_python_interpreter so that
 it can be overriden at a task level

---
 bin/ansible-with-atl-env      | 2 +-
 group_vars/aws_node_local.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/ansible-with-atl-env b/bin/ansible-with-atl-env
index e9e6e75..798b081 100755
--- a/bin/ansible-with-atl-env
+++ b/bin/ansible-with-atl-env
@@ -20,7 +20,7 @@ set +a
 pipenv run \
     ansible-playbook -v \
         $ATL_DEPLOYMENT_REPOSITORY_CUSTOM_PARAMS \
-        -e "ansible_python_interpreter=$(pipenv --venv)/bin/python" \
+        -e "pipenv_venv=$(pipenv --venv)/bin/python" \
         -e "${PLAYBOOK_INVOCATION_EXTRA_PARAMS}" \
         -i $INV \
         $PLAYBOOK \
diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 6f85bbd..c5f297e 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -9,6 +9,8 @@
 #
 #    https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
 
+ansible_python_interpreter: "{{ pipenv_venv | default(omit) }}"
+
 java_major_version: "8"
 postgres_version: "9.6"
 git_version: "2.14.4"