Move start menu task to client and move gpo script to setup.yml

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

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']

ansible/roles/win_domain_controller/tasks/group_policy.yml

@@ -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']
-      

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

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

ansible/roles/win_domain_controller/vars/main.yml

@@ -1,2 +1 @@
-group_policy_script: OpenStackADBuildv6.2.ps1
-start_menu_xml: wawb01.xml
+group_policy_script: OpenStackADBuildv6.2.ps1