Merge branch 'main' into feat/compute-script

Author: bertiethorpe

ansible/adhoc/rebuild.yml

@@ -16,3 +16,6 @@
     - command: "openstack server rebuild {{ instance_id | default(inventory_hostname) }}{% if rebuild_image is defined %} --image {{ rebuild_image }}{% endif %}"
       delegate_to: localhost
     - wait_for_connection:
+        delay: 60
+        timeout: 600
+