From 00e0aaea7d01f6b79c3385155bbf11cce78f398d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20BENO=C3=8ET?= <tseeker@nocternity.net>
Date: Sun, 29 Dec 2024 20:56:06 +0100
Subject: [PATCH] refactor: clean up Ansible installation

---
 ansible/provision.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ansible/provision.yml b/ansible/provision.yml
index a6523aa..f1ba864 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -51,6 +51,10 @@
       - vim-gtk3
       - virt-manager
       - zsh
+    # Version of the git-delta utility
+    git_delta_version: 0.18.2
+    # Version of the atuin utility
+    atuin_version: 18.4.0
     # Version of ASDF itself
     asdf_version: 0.15.0
     # Tools that will be installed using asdf
@@ -70,8 +74,8 @@
       opentofu: 1.8.1
       packer: 1.11.0
       terragrunt: 0.66.9
-    # Python packages to install
-    python_packages:
+    # Python packages to install in the Ansible venv
+    ansible_packages:
       - ansible>=9,<10
       - dnspython
       - netaddr
@@ -81,10 +85,6 @@
       - requests
       - git+https://github.com/vmware/vsphere-automation-sdk-python.git
       - pywinrm
-    # Version of the git-delta utility
-    git_delta_version: 0.18.2
-    # Version of the atuin utility
-    atuin_version: 18.4.0
     # Vim plugins that need to be installed
     vim_plugins:
       - airblade/vim-gitgutter
@@ -555,7 +555,7 @@
             chdir: /home/vagrant
             executable: /bin/zsh
 
-        # Install Ansible 9 and various packages in a Python venv
+        # Install Ansible and various packages in a Python venv
         - name: Ensure vagrant user has a .local directory
           loop: [ bin, share ]
           ansible.builtin.file:
@@ -568,7 +568,7 @@
             cmd: >-
               source .zshrc && {
                 [ -d /home/vagrant/.local/share/ansible ] ||
-                  python -m venv /home/vagrant/.local/share/ansible;
+                  /usr/bin/python -m venv /home/vagrant/.local/share/ansible;
               }
             chdir: /home/vagrant
 
@@ -578,7 +578,7 @@
             cmd: >-
               source /home/vagrant/.zshrc &&
               source /home/vagrant/.local/share/ansible/bin/activate &&
-              pip install "{{ python_packages | join('" "') }}"
+              pip install "{{ ansible_packages | join('" "') }}"
             chdir: /home/vagrant/.local/share
 
         - name: List Ansible executables