DCD-686: Move back to pipenv-based Ansible installation to work around bugs (again).

bin/ansible-with-atl-env

@@ -14,8 +14,9 @@ source $ENV_FILE
 set +a
 
 # Use Ansible from virtualenv if provided
-ansible-playbook -v \
-    $ATL_DEPLOYMENT_REPOSITORY_CUSTOM_PARAMS \
-    -i $INV \
-    $PLAYBOOK \
-    2>&1 | tee --append $LOG_FILE
+pipenv run \
+    ansible-playbook -v \
+        $ATL_DEPLOYMENT_REPOSITORY_CUSTOM_PARAMS \
+        -i $INV \
+        $PLAYBOOK \
+        2>&1 | tee --append $LOG_FILE

bin/install-ansible

@@ -2,21 +2,13 @@
 
 set -e
 
-# Amazon Linux 2 packages Ansible separately, so enable the repo
-. /etc/os-release
-if [[ $ID == 'amzn' ]]; then
-    amazon-linux-extras enable ansible2
-fi
-
 ./bin/pacapt install --noconfirm \
-             ansible \
-             python-boto3 \
-             python-botocore
+             python3-dev \
+             python3-pip
+
+pip3 install pipenv
+pipenv sync
 
 if [[ $1 == "--dev" ]]; then
-    ./bin/pacapt install --noconfirm \
-                 python3-dev python3-pip
-
-    pip3 install pipenv
     pipenv sync --dev
 fi