From dbd87d6013fba6f3f809bfdc95a13dd91fd8805c Mon Sep 17 00:00:00 2001
From: MKletz <michael.kletz.27@gmail.com>
Date: Mon, 13 Nov 2023 09:12:43 -0600
Subject: [PATCH] added reboots for create domain

---
 windows/create_ad_domain.yml | 58 +++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/windows/create_ad_domain.yml b/windows/create_ad_domain.yml
index feb1303a1..ca9013f59 100644
--- a/windows/create_ad_domain.yml
+++ b/windows/create_ad_domain.yml
@@ -13,30 +13,23 @@
       ansible.windows.win_domain:
         dns_domain_name: ansible.local
         safe_mode_password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}"
-      register: new_forest
+      notify: 
+        - Reboot host
+        - Wait for AD services
+        - Reboot again
+        - Wait for AD services again
 
-    - name: Reboot the target host
-      ansible.windows.win_reboot:
-        reboot_timeout: 3600
-      when: new_forest.reboot_required
-
-    - name: Wait up to 10min for AD web services to start
-      community.windows.win_wait_for_process:
-        process_name_exact: Microsoft.ActiveDirectory.WebServices
-        pre_wait_delay: 60
-        state: present
-        timeout: 600
-        sleep: 10
-      remote_user: Administrator
+    - name: Flush handlers
+      meta: flush_handlers
 
     - name: Create some groups
       community.windows.win_domain_group:
         name: "{{ item.name }}"
         scope: global
       loop:
-        - {name: "GroupA"}
-        - {name: "GroupB"}
-        - {name: "GroupC"}
+        - { name: "GroupA" }
+        - { name: "GroupB" }
+        - { name: "GroupC" }
       retries: 5
       delay: 10
 
@@ -47,8 +40,33 @@
         password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}"
         update_password: on_create
       loop:
-        - {name: "UserA", groups: "GroupA"}
-        - {name: "UserB", groups: "GroupB"}
-        - {name: "UserC", groups: "GroupC"}
+        - { name: "UserA", groups: "GroupA" }
+        - { name: "UserB", groups: "GroupB" }
+        - { name: "UserC", groups: "GroupC" }
       retries: 5
       delay: 10
+
+  handlers:
+    - name: Reboot host
+      ansible.windows.win_reboot:
+        reboot_timeout: 3600
+
+    - name: Wait for AD services
+      community.windows.win_wait_for_process:
+        process_name_exact: Microsoft.ActiveDirectory.WebServices
+        pre_wait_delay: 60
+        state: present
+        timeout: 600
+        sleep: 10
+
+    - name: Reboot again
+      ansible.windows.win_reboot:
+        reboot_timeout: 3600
+
+    - name: Wait for AD services again
+      community.windows.win_wait_for_process:
+        process_name_exact: Microsoft.ActiveDirectory.WebServices
+        pre_wait_delay: 60
+        state: present
+        timeout: 600
+        sleep: 10