From fa61970756813d8111d27a06c915d599e549236f Mon Sep 17 00:00:00 2001
From: Geoff Jacobs <gjacobs@atlassian.com>
Date: Fri, 11 Aug 2023 13:40:08 +1000
Subject: [PATCH] reverting previous changes. issue turned out to be the wrong
 version of python on a node

---
 bin/ansible-with-atl-env                         | 2 +-
 group_vars/aws_node_local.yml                    | 3 ---
 roles/linux_common/defaults/main.yml             | 1 -
 roles/linux_common/molecule/default/converge.yml | 1 -
 roles/linux_common/tasks/main.yml                | 2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/bin/ansible-with-atl-env b/bin/ansible-with-atl-env
index 798b081..e9e6e75 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 "pipenv_venv=$(pipenv --venv)/bin/python" \
+        -e "ansible_python_interpreter=$(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 4e6dcff..6f85bbd 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -9,9 +9,6 @@
 #
 #    https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
 
-pipenv_venv: /usr/bin/python  # this will get overridden by the wrapper scripts, but should allow molecule to run
-ansible_python_interpreter: "{{ pipenv_venv }}"
-
 java_major_version: "8"
 postgres_version: "9.6"
 git_version: "2.14.4"
diff --git a/roles/linux_common/defaults/main.yml b/roles/linux_common/defaults/main.yml
index fb0d831..cb751b1 100644
--- a/roles/linux_common/defaults/main.yml
+++ b/roles/linux_common/defaults/main.yml
@@ -2,4 +2,3 @@
 
 atl_product_user_uid: '2001'
 git_version: "2.14.4"
-pipenv_venv: "/usr/bin/python"
\ No newline at end of file
diff --git a/roles/linux_common/molecule/default/converge.yml b/roles/linux_common/molecule/default/converge.yml
index cfbd05c..22677b5 100644
--- a/roles/linux_common/molecule/default/converge.yml
+++ b/roles/linux_common/molecule/default/converge.yml
@@ -3,6 +3,5 @@
   hosts: all
   vars:
     atl_product_user: "jira"
-    pipenv_venv: "/usr/bin/python"
   roles:
     - role: linux_common
diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml
index 2c631c9..6155140 100644
--- a/roles/linux_common/tasks/main.yml
+++ b/roles/linux_common/tasks/main.yml
@@ -18,8 +18,6 @@
       - curl
       - unzip
       - fontconfig
-  vars:
-    ansible_python_interpreter: "{{ '/usr/bin/python2' if ((ansible_distribution | lower == 'amazon') and (ansible_distribution_version == '2')) else pipenv_venv }}"
 
 - name: Create product group
   ansible.builtin.group: