diff --git a/extra_playbooks/wait-for-cloud-init.yml b/extra_playbooks/wait-for-cloud-init.yml
new file mode 100644
index 000000000..7aa92d4c1
--- /dev/null
+++ b/extra_playbooks/wait-for-cloud-init.yml
@@ -0,0 +1,5 @@
+---
+- hosts: all
+  tasks:
+    - name: Wait for cloud-init to finish
+      command: cloud-init status --wait