From 56f19b86fe8fed0f22721819d44cdad6100253b2 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Wed, 18 Dec 2024 15:37:14 +0000
Subject: [PATCH] Remove users that fail during creation to prevent assert step
 failing on reruns

---
 ansible/roles/win_user/tasks/create.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/win_user/tasks/create.yml b/ansible/roles/win_user/tasks/create.yml
index a5ddeae..0baf29c 100644
--- a/ansible/roles/win_user/tasks/create.yml
+++ b/ansible/roles/win_user/tasks/create.yml
@@ -11,7 +11,7 @@
         groups:
           add:
             - "{{ study_code }}"
-            - Remote Desktop Users
+            - "{{ guacamole_user_group }}"
         email: "{{ email }}"
         attributes:
           add:
@@ -20,4 +20,14 @@
         password_expired: true
         state: present
 
-    - import_tasks: exporter.yml # referece exporter so modify can be more general purpose
\ No newline at end of file
+    - import_tasks: exporter.yml # referece exporter so modify can be more general purpose
+
+  rescue:
+    - name: Removing failed User
+      microsoft.ad.user:
+        name: "{{ username }}"
+        path: ou=Project Users,dc={{ win_project }},dc=loc
+        state: absent
+      
+    - name: Trigger Failure
+      ansible.builtin.fail:
\ No newline at end of file