use cloudinit-wait from git

ansible/ansible.cfg

@@ -1,5 +1,5 @@
 [defaults]
-roles_path=roles
+roles_path=~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:roles
 inventory=inventory
 vault_password_file=util/secret-service-client.sh
 interpreter_python=/usr/bin/python3

ansible/hermes.yml

@@ -1,27 +1,12 @@
----
-- hosts: all
-  gather_facts: no
-
-  pre_tasks:
-    - name: Wait for host to come up
-      tags: always
-      block:
-      - name: Wait for SSH connection
-        wait_for:
-          state: started
-          port: 22
-          host: "192.168.30.7"
-          timeout: 300
-          connect_timeout: 300
-          search_regex: OpenSSH
-        delegate_to: localhost
 - name: Wait for cloud-init to finish
-        command:
+  hosts: all
-          cmd: cloud-init status --wait
+  gather_facts: no
-        register: cloudinit
+  roles:
-        changed_when: "'..' in cloudinit.stdout"
+    - 'cloudinit-wait'
-      - name: Gather facts
+
-        setup:
+- name: Install services
+  hosts: all
+  pre_tasks:
     - name: Copy resolv.conf
       copy:
         src: resolv.conf
@@ -38,7 +23,6 @@
         pkg:
           - qemu-guest-agent
           - dnsutils
-
   roles:
     - {role: 'dnsmasq', tags: 'dnsmasq'}
     - {role: 'nsd', tags: 'nsd'}

ansible/requirements.yml

@@ -0,0 +1,3 @@
+- name: cloudinit-wait
+  src: https://git.pim.kunis.nl/pim/ansible-role-cloudinit-wait
+  scm: git