Refactoring to Ansible Collection

.github/workflows/tests.yml

@@ -65,24 +65,23 @@ jobs:
 
       - name: Deploy the test VMs
         run: |
-          cd ansible
           if [ "${{ matrix.os }}" = "centos/9-Stream" ]; then
-            cp hosts.yaml.example.centos hosts.yaml
+            inventory_file=inventories/baremetal-centos.yaml
           else
-            cp hosts.yaml.example hosts.yaml
+            inventory_file=inventories/baremetal.yaml
           fi
 
-          ansible-playbook tasks/update-packages.yaml
+          ansible-playbook -i $inventory_file playbooks/update_packages.yaml
 
           if [ "${{ matrix.os }}" = "ubuntu/20.04" ]; then
             # Ubuntu 20.04's OVN is too old.
-            sed -i "s/ovn_release:.*/ovn_release: \"ppa\"/g" hosts.yaml
+            sed -i "s/ovn_release:.*/ovn_release: \"ppa\"/g" $inventory_file
           elif [ "${{ matrix.os }}" = "debian/12" ]; then
             # ZFS on Debian needs compiling which is slow, use btrfs instead
-            sed -i "s/driver: zfs/driver: btrfs/g" hosts.yaml
+            sed -i "s/driver: zfs/driver: btrfs/g" $inventory_file
           fi
 
-          ansible-playbook deploy.yaml
+          ansible-playbook -i $inventory_file -v deploy.yaml
 
       - name: Post deployment validation
         run: |

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 __pycache__
+data/*

.zed/tasks.json

@@ -6,8 +6,8 @@
     "shell": "system"
   }, {
     "label": "Deploy dev cluster",
-    "command": "ansible-playbook deploy.yaml",
-    "cwd": "$ZED_WORKTREE_ROOT/ansible",
+    "command": "ansible-playbook -i inventories/baremetal.yaml deploy.yaml",
+    "cwd": "$ZED_WORKTREE_ROOT",
     "shell": "system"
   }
 ]

README.md

@@ -34,9 +34,9 @@ tofu apply -target=module.baremetal
 ```
 
 ### Run the Ansible Playbook
-Go to the ansible directory:
+Go to the repository root directory:
 ```
-cd ../ansible/
+cd ../
 ```
 
 NOTE: If you need the same version of Ansible this was tested with:
@@ -47,15 +47,11 @@ pipenv shell
 ansible-galaxy install -r ansible_requirements.yml
 ```
 
-Copy the example inventory file:
-```
-cp hosts.yaml.example hosts.yaml
-```
 NOTE: If you are connecting to a remote Incus host you will need to change the `ansible_incus_remote` variable to match the name of the Incus remote (see: `incus remote list` for a list of remote names to use).
 
 Run the Playbooks:
 ```
-ansible-playbook deploy.yaml
+ansible-playbook -i inventories/baremetal.yaml deploy.yaml
 ```
 
 NOTE: When re-deploying the same cluster (e.g. following a `terraform destroy`),
@@ -65,9 +61,9 @@ connection to the previously deployed systems which will cause the
 deployment to get stuck.
 
 ```
-rm ansible/data/ceph/*
-rm ansible/data/lvmcluster/*
-rm ansible/data/ovn/*
+rm data/ceph/*
+rm data/lvmcluster/*
+rm data/ovn/*
 ```
 
 ### Test a VM and Container on the new Incus cluster

ansible/ansible.cfg → ansible.cfg

@@ -1,9 +1,10 @@
 [defaults]
-inventory = hosts.yaml
 error_on_undefined_vars = false
 timeout = 30
 forks = 10
 connection_plugins = plugins/connection/
 
+stdout_callback = yaml
+
 [inventory]
 enable_plugins = yaml