10 files changed, 23 insertions, 63 deletions
diff --git a/configure.yml b/configure.yml
index 4592d1ed..ae51b2c2 100644
--- a/configure.yml
+++ b/configure.yml
@@ -45,14 +45,6 @@
     - role: "obsidian"
     - role: "microsoft-teams"
     - role: "hyprland"
-  post_tasks:
-    - name: "Reboot if required"
-      become: true
-      ansible.builtin.command: "shutdown -r now"
-      async: 1
-      poll: 0
-      changed_when: true
-      when: reboot_required | default(false)
 
 - name: "Nvidia configure"
   gather_facts: true
@@ -61,14 +53,6 @@
   roles:
     - role: "nvidia_gtx1060"
     - role: "steam"
-  post_tasks:
-    - name: "Reboot if required"
-      become: true
-      ansible.builtin.command: "shutdown -r now"
-      async: 1
-      poll: 0
-      changed_when: true
-      when: reboot_required | default(false)
 
 - name: "Mac nvidia configure"
   gather_facts: true
@@ -77,14 +61,6 @@
   roles:
     - role: "nvidia_gt750m"
     - role: "steam"
-  post_tasks:
-    - name: "Reboot if required"
-      become: true
-      ansible.builtin.command: "shutdown -r now"
-      async: 1
-      poll: 0
-      changed_when: true
-      when: reboot_required | default(false)
 
 - name: "Ubuntu configure"
   gather_facts: true
@@ -118,14 +94,6 @@
     - role: "obsidian"
     - role: "microsoft-teams"
     - role: "gnome-calendar"
-  post_tasks:
-    - name: "Reboot if required"
-      become: true
-      ansible.builtin.command: "shutdown -r now"
-      async: 1
-      poll: 0
-      changed_when: true
-      when: reboot_required | default(false)
 
 - name: "Raspberry Pi configure"
   gather_facts: true
@@ -153,11 +121,3 @@
     - role: "prometheus"
     - role: "grafana"
     - role: "neomutt"
-  post_tasks:
-    - name: "Reboot if required"
-      become: true
-      ansible.builtin.command: "shutdown -r now"
-      async: 1
-      poll: 0
-      changed_when: true
-      when: reboot_required | default(false)
diff --git a/roles/ddcutil/handlers/main.yml b/roles/ddcutil/handlers/main.yml
index dfc50931..26c67998 100644
--- a/roles/ddcutil/handlers/main.yml
+++ b/roles/ddcutil/handlers/main.yml
@@ -5,7 +5,7 @@
     cmd: "udevadm control --reload-rules"
   changed_when: true
 
-- name: "Require reboot"
-  ansible.builtin.set_fact:
-    # This flag is used to trigger a post_task of rebooting after the playbook finishes
-    reboot_required: true
+- name: "Reboot"
+  become: true
+  ansible.builtin.reboot:
+    reboot_timeout: 600
diff --git a/roles/ddcutil/tasks/main.yml b/roles/ddcutil/tasks/main.yml
index 5b97b5e1..8b58b09e 100644
--- a/roles/ddcutil/tasks/main.yml
+++ b/roles/ddcutil/tasks/main.yml
@@ -12,7 +12,6 @@
     mode: "0644"
     content: |
       i2c-dev
-  notify: "Require reboot"
 
 - name: "Ensure i2c group is created"
   become: true
@@ -36,4 +35,4 @@
       KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660"
   notify:
     - "Reload rules"
-    - "Require reboot"
+    - "Reboot"
diff --git a/roles/gnome/handlers/main.yml b/roles/gnome/handlers/main.yml
index 5b3adc50..7cefa529 100644
--- a/roles/gnome/handlers/main.yml
+++ b/roles/gnome/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Require reboot"
-  ansible.builtin.set_fact:
-    # This flag is used to trigger a post_task of rebooting after the playbook finishes
-    reboot_required: true
+- name: "Reboot"
+  become: true
+  ansible.builtin.reboot:
+    reboot_timeout: 600
diff --git a/roles/gnome/tasks/install-archlinux.yml b/roles/gnome/tasks/install-archlinux.yml
index 5222ff3f..b0f683bd 100644
--- a/roles/gnome/tasks/install-archlinux.yml
+++ b/roles/gnome/tasks/install-archlinux.yml
@@ -4,7 +4,7 @@
   ansible.builtin.package:
     name: "{{ gnome_packages }}"
     state: "present"
-  notify: "Require reboot"
+  notify: "Reboot"
 
 - name: "Enable GDM display manager"
   become: true
diff --git a/roles/gnome/tasks/install-debian.yml b/roles/gnome/tasks/install-debian.yml
index 9ecdecb6..7481d04d 100644
--- a/roles/gnome/tasks/install-debian.yml
+++ b/roles/gnome/tasks/install-debian.yml
@@ -5,7 +5,7 @@
     name: "{{ gnome_packages }}"
     state: "present"
     install_recommends: false
-  notify: "Require reboot"
+  notify: "Reboot"
   tags:
     # NOTE: the gnome-core packages resinstalls the avahi packages
     # Disabling the idemopotence test to prevent always reporting changed
diff --git a/roles/nvidia_gt750m/handlers/main.yml b/roles/nvidia_gt750m/handlers/main.yml
index 92ff35d2..58b9b02c 100644
--- a/roles/nvidia_gt750m/handlers/main.yml
+++ b/roles/nvidia_gt750m/handlers/main.yml
@@ -5,6 +5,7 @@
     cmd: "mkinitcpio -P"
   changed_when: true
 
-- name: "Require reboot"
-  ansible.builtin.set_fact:
-    reboot_required: true
+- name: "Reboot"
+  become: true
+  ansible.builtin.reboot:
+    reboot_timeout: 600
diff --git a/roles/nvidia_gt750m/tasks/install-archlinux.yml b/roles/nvidia_gt750m/tasks/install-archlinux.yml
index b5c70541..68412d5c 100644
--- a/roles/nvidia_gt750m/tasks/install-archlinux.yml
+++ b/roles/nvidia_gt750m/tasks/install-archlinux.yml
@@ -15,7 +15,7 @@
     mode: "0644"
   notify:
     - "Rebuild initramfs"
-    - "Require reboot"
+    - "Reboot"
   tags:
     - "molecule-notest"
 
@@ -43,6 +43,6 @@
     line: "MODULES=({{ all_modules | join(' ') }})"
   notify:
     - "Rebuild initramfs"
-    - "Require reboot"
+    - "Reboot"
   tags:
     - "molecule-notest"
diff --git a/roles/nvidia_gtx1060/handlers/main.yml b/roles/nvidia_gtx1060/handlers/main.yml
index 56f4faec..58b9b02c 100644
--- a/roles/nvidia_gtx1060/handlers/main.yml
+++ b/roles/nvidia_gtx1060/handlers/main.yml
@@ -5,7 +5,7 @@
     cmd: "mkinitcpio -P"
   changed_when: true
 
-- name: "Require reboot"
-  ansible.builtin.set_fact:
-    # This flag is used to trigger a post_task of rebooting after the playbook finishes
-    reboot_required: true
+- name: "Reboot"
+  become: true
+  ansible.builtin.reboot:
+    reboot_timeout: 600
diff --git a/roles/nvidia_gtx1060/tasks/install-archlinux.yml b/roles/nvidia_gtx1060/tasks/install-archlinux.yml
index b043a2f6..1105135e 100644
--- a/roles/nvidia_gtx1060/tasks/install-archlinux.yml
+++ b/roles/nvidia_gtx1060/tasks/install-archlinux.yml
@@ -21,7 +21,7 @@
     mode: "0644"
   notify:
     - "Rebuild initramfs"
-    - "Require reboot"
+    - "Reboot"
   tags:
     # Since the /etc/mkinitcpio isn't available on the docker container
     # Ignore this for testing,
@@ -53,7 +53,7 @@
     line: "MODULES=({{ all_modules | join(' ') }})"
   notify:
     - "Rebuild initramfs"
-    - "Require reboot"
+    - "Reboot"
   tags:
     # Since the /etc/mkinitcpio isn't available on the docker container
     # Ignore this for testing,