Merged in fix-ansible-python-interpreter (pull request #203)

reverting previous changes. issue turned out to be the wrong version of python on a node

Approved-by: Eugene Ivantsov

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 \

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"

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"

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

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: