From 1db1da5577130a843e73939c248f90eb23e9ee11 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 27 Sep 2024 09:41:21 +0100
Subject: [PATCH] set proxy after reboot and add forced reboot step

---
 ansible/roles/win_initial/tasks/initial.yml | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/ansible/roles/win_initial/tasks/initial.yml b/ansible/roles/win_initial/tasks/initial.yml
index 0c0abcf..a604314 100644
--- a/ansible/roles/win_initial/tasks/initial.yml
+++ b/ansible/roles/win_initial/tasks/initial.yml
@@ -28,22 +28,12 @@
     start_mode: delayed
   tags: winrm_delayed
 
-- name: Set a proxy
-  vars:
-    proxy_ip: "{{ os_project }}-{{ win_project }}-proxy"
-  tags: proxy
-  win_inet_proxy:
-    proxy: "{{ hostvars[proxy_ip].ansible_host }}:3128"
-    bypass:
-    - <local>
-  when: |
-    inventory_hostname in groups['meta-type_client']|default([]) and
-    project_zone == 'protected'
+- name: Reboot VMs before continuing
+  win_reboot:
 
 - name: Remove Local Admin
   tags: 
     - remove_admin
-    - never
   block:
     - name: Delete admin user account
       win_user:
@@ -63,6 +53,18 @@
         path: "C:\\Users\\Admin"
         state: absent
 
+- name: Set a proxy
+  vars:
+    proxy_ip: "{{ os_project }}-{{ win_project }}-proxy"
+  tags: proxy
+  win_inet_proxy:
+    proxy: "{{ hostvars[proxy_ip].ansible_host }}:3128"
+    bypass:
+    - <local>
+  when: |
+    inventory_hostname in groups['meta-type_client']|default([]) and
+    project_zone == 'protected'
+
 - name: Create EIDF directory in system drive
   win_file:
     path: "C:\\eidf"