From 5f531660890963c0c4afe86af537e32897091499 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 24 May 2024 10:58:03 +0100
Subject: [PATCH] Move start menu task to client and move gpo script to
 setup.yml

---
 .../files/workbench.xml}                           |  0
 ansible/roles/win_client/tasks/main.yml            |  1 +
 ansible/roles/win_client/tasks/start_menu.yml      | 11 +++++++++++
 .../win_domain_controller/tasks/group_policy.yml   | 14 --------------
 ansible/roles/win_domain_controller/tasks/main.yml |  1 -
 .../roles/win_domain_controller/tasks/setup.yml    |  7 ++++++-
 ansible/roles/win_domain_controller/vars/main.yml  |  3 +--
 7 files changed, 19 insertions(+), 18 deletions(-)
 rename ansible/roles/{win_domain_controller/files/start_menu.xml => win_client/files/workbench.xml} (100%)
 create mode 100644 ansible/roles/win_client/tasks/start_menu.yml
 delete mode 100644 ansible/roles/win_domain_controller/tasks/group_policy.yml

diff --git a/ansible/roles/win_domain_controller/files/start_menu.xml b/ansible/roles/win_client/files/workbench.xml
similarity index 100%
rename from ansible/roles/win_domain_controller/files/start_menu.xml
rename to ansible/roles/win_client/files/workbench.xml
diff --git a/ansible/roles/win_client/tasks/main.yml b/ansible/roles/win_client/tasks/main.yml
index 3a1d13c..0bae0f6 100644
--- a/ansible/roles/win_client/tasks/main.yml
+++ b/ansible/roles/win_client/tasks/main.yml
@@ -1,4 +1,5 @@
 ---
 - import_tasks: features.yml
 - import_tasks: chocolatey.yml
+- import_tasks: start_menu.yml
 - import_tasks: rd_gateway.yml
\ No newline at end of file
diff --git a/ansible/roles/win_client/tasks/start_menu.yml b/ansible/roles/win_client/tasks/start_menu.yml
new file mode 100644
index 0000000..4c49c78
--- /dev/null
+++ b/ansible/roles/win_client/tasks/start_menu.yml
@@ -0,0 +1,11 @@
+---
+- name: Copy start menu files
+  tags: copy_startmenu
+  block:
+    - name: Copy start menu XML to client VMs
+      win_copy:
+        src: "workbench.yml"
+        dest: "C:\\eidf\\start_menu.yml"
+        force: true
+      tags: workbench_startmenu
+      when: inventory_hostname in groups['meta-variant_workbench']
diff --git a/ansible/roles/win_domain_controller/tasks/group_policy.yml b/ansible/roles/win_domain_controller/tasks/group_policy.yml
deleted file mode 100644
index 100da23..0000000
--- a/ansible/roles/win_domain_controller/tasks/group_policy.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Apply group policy
-  win_shell: powershell C:\eidf\{{ group_policy_script }}
-  tags: apply_gpo
-  when: inventory_hostname in groups['meta-name_dc01']
-
-- name: Copy Start menu DC01
-  win_copy:
-    src: "{{ start_menu_xml }}"
-    dest: "C:\\eidf"
-    force: true
-  tags: start_menu
-  when: inventory_hostname in groups['meta-name_dc01']
-      
\ No newline at end of file
diff --git a/ansible/roles/win_domain_controller/tasks/main.yml b/ansible/roles/win_domain_controller/tasks/main.yml
index 06141e2..49f47c7 100644
--- a/ansible/roles/win_domain_controller/tasks/main.yml
+++ b/ansible/roles/win_domain_controller/tasks/main.yml
@@ -2,5 +2,4 @@
 - import_tasks: features.yml
 - import_tasks: setup.yml
 - import_tasks: users.yml
-- import_tasks: group_policy.yml
 #- import_tasks: remote_desktop.yml
diff --git a/ansible/roles/win_domain_controller/tasks/setup.yml b/ansible/roles/win_domain_controller/tasks/setup.yml
index a523680..f55987a 100644
--- a/ansible/roles/win_domain_controller/tasks/setup.yml
+++ b/ansible/roles/win_domain_controller/tasks/setup.yml
@@ -20,13 +20,18 @@
         force: true
 
 - name: Group policy script
-  tags: copy_script
+  tags: gpo_script
   block:
     - name: Copy Group Policy script to DC01
       win_copy:
         src: "{{ group_policy_script }}"
         dest: "C:\\eidf"
         force: true
+      tags: copy_script
+
+    - name: Apply group policy
+      win_shell: powershell C:\eidf\{{ group_policy_script }}
+      tags: apply_script
   when: inventory_hostname in groups['meta-name_dc01']
 
 - name: Promote DC01
diff --git a/ansible/roles/win_domain_controller/vars/main.yml b/ansible/roles/win_domain_controller/vars/main.yml
index 4af3e0d..c429b00 100644
--- a/ansible/roles/win_domain_controller/vars/main.yml
+++ b/ansible/roles/win_domain_controller/vars/main.yml
@@ -1,2 +1 @@
-group_policy_script: OpenStackADBuildv6.2.ps1
-start_menu_xml: wawb01.xml
\ No newline at end of file
+group_policy_script: OpenStackADBuildv6.2.ps1
\ No newline at end of file