Adjust readme and tests to the new repo structure

Signed-off-by: Markus Katharina Brechtel <[email protected]>

Author: mkbrechtel

.github/workflows/tests.yml

@@ -64,15 +64,13 @@ jobs:
 
       - name: Deploy the test VMs
         run: |
-          cd ansible
-          cp hosts.yaml.example hosts.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" inventories/baremetal.yaml
           fi
 
-          ansible-playbook deploy.yaml
+          ansible-playbook -i inventories/baremetal.yaml deploy.yaml
 
       - name: Post deployment validation
         run: |

README.md

@@ -34,9 +34,9 @@ tofu apply -target=module.baremetal
 ```
 
 ### Run the Ansible Playbook
-Go to the ansible directory:
+Go back to the repo 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.cfg

@@ -1,5 +1,4 @@
 [defaults]
-inventory = inventories/baremetal.yaml
 error_on_undefined_vars = false
 timeout = 30
 forks = 10