From 02c0c31e8614997ce80c3a741862e2ea3462d977 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 7 Jun 2024 09:31:06 +0100
Subject: [PATCH] Use variables for the required OUs

---
 ansible/roles/win_domain_controller/tasks/users.yml | 11 +++--------
 ansible/roles/win_domain_controller/vars/main.yml   |  9 ++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/win_domain_controller/tasks/users.yml b/ansible/roles/win_domain_controller/tasks/users.yml
index 1633901..571acf0 100644
--- a/ansible/roles/win_domain_controller/tasks/users.yml
+++ b/ansible/roles/win_domain_controller/tasks/users.yml
@@ -1,6 +1,6 @@
 ---
-- name: Users
-  tags: post_promotion_users
+- name: Create Required OUs and Users 
+  tags: post_promotion_tasks
   block:
     - name: Create various OUs
       community.windows.win_domain_ou:
@@ -8,12 +8,7 @@
         path: "DC={{ win_project }},DC=loc"
         state: present
         protected: true
-      loop:
-        - Project Users
-        - Project Groups
-        - Disabled Users
-        - Management Computers
-        - User Computers
+      loop: "{{ OUs }}"
 
     - name: Create file-transfer user for
       community.windows.win_domain_user:
diff --git a/ansible/roles/win_domain_controller/vars/main.yml b/ansible/roles/win_domain_controller/vars/main.yml
index c429b00..829526b 100644
--- a/ansible/roles/win_domain_controller/vars/main.yml
+++ b/ansible/roles/win_domain_controller/vars/main.yml
@@ -1 +1,8 @@
-group_policy_script: OpenStackADBuildv6.2.ps1
\ No newline at end of file
+group_policy_script: OpenStackADBuildv6.2.ps1
+
+OUs:
+  - Project Users
+  - Project Groups
+  - Disabled Users
+  - Management Computers
+  - User Computers
\ No newline at end of file