From ca8dd7b0534625b16376837c2ee737b48991606d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 2 Jan 2021 14:05:59 +0100
Subject: install playbooks: fix order handlers and reboot

---
 common/vm-install.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'common/vm-install.yml')

diff --git a/common/vm-install.yml b/common/vm-install.yml
index ce438905..f89ab6ba 100644
--- a/common/vm-install.yml
+++ b/common/vm-install.yml
@@ -48,15 +48,22 @@
     when: install_distro in ['debian', 'ubuntu']
   - role: vm/guest/base
     when: install_distro in ['debian', 'ubuntu']
-  - role: reboot-and-wait
-    reboot_delay: 10
-    reboot_timeout: 120
 
   post_tasks:
   - name: reenable StrictHostKeyChecking
     set_fact:
       ansible_ssh_extra_args: ""
 
+  - name: run all handlers before rebooting
+    meta: flush_handlers
+
+  - name: reboot the new machine
+    vars:
+      reboot_delay: 10
+      reboot_timeout: 120
+    import_role:
+      name: reboot-and-wait
+
 
 - name: run host playbook
   vars:
-- 
cgit v1.2.3