Merge branch 'main' into feat/image-build

Author: m-bull

.gitignore

@@ -7,4 +7,6 @@
 inventory.*
 __pycache__
 terraform/backend.tf
-inventory
+inventory
+venv
+bin

ansible.cfg

@@ -6,7 +6,8 @@ host_key_checking = False
 remote_tmp = /tmp
 # Enable our custom vars plugin that parses variables from the current working directory
 vars_plugins_enabled = host_group_vars,cwd_host_group_vars
-roles_path = roles:vendor/stackhpc/ansible-slurm-appliance/ansible/roles
+roles_path = vendor/stackhpc/ansible-slurm-appliance/ansible/roles:roles
+callbacks_enabled = ansible.posix.profile_tasks
 
 [ssh_connection]
 ssh_args = -o ControlMaster=auto -o ControlPersist=240s -o PreferredAuthentications=publickey -o UserKnownHostsFile=/dev/null

requirements.yml

@@ -39,5 +39,5 @@ collections:
     version: 1.10.0
   - name: https://github.com/stackhpc/ansible-collection-terraform
     type: git
-    version: 75fb75132bbc77e3e78a05ba674458131da2b1dd
-    
+    version: dadf2e81b78cfd267821c568f92d3a8da6541a41
+

roles/cluster_infra/tasks/main.yml

@@ -73,8 +73,8 @@
               else 'vd'
            }}
   # Only run when block_device_prefix isn't set as an extravar
-  when: block_device_prefix is not defined
-
+  when:
+    - block_device_prefix is not defined
 
 - name: Template Terraform files into project directory
   template: