From 8a49590720c43e686a611e1417ab714850ab762f Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 6 Sep 2024 16:06:54 +0100
Subject: [PATCH] extra steps on os-trasnfer

---
 ansible/playbooks/win_study.yml               | 17 ++++++++++++++++-
 ansible/roles/win_study/tasks/delete.yml      | 18 +++++++++++++-----
 ansible/roles/win_study/tasks/main.yml        | 13 +++++++++++--
 ansible/roles/win_study/tasks/os-transfer.yml | 13 +++++++++++++
 ansible/roles/win_study/vars/main.yml         |  5 +++++
 5 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 ansible/roles/win_study/tasks/os-transfer.yml

diff --git a/ansible/playbooks/win_study.yml b/ansible/playbooks/win_study.yml
index a6fdede..d021c61 100644
--- a/ansible/playbooks/win_study.yml
+++ b/ansible/playbooks/win_study.yml
@@ -1,9 +1,24 @@
 ---
-- hosts: "meta-name_fs01"
+- name: Fileserver tasks
+  hosts: "meta-name_fs01"
   gather_facts: false
+  vars:
+    fileserver_tasks: yes
   vars_files:
     - ../vars/common.yml
     - ../vars/connection.yml
   roles:
     - role: win_study
       tags: win_study
+
+- name: os-transfer tasks
+  hosts: os-transfer
+  # many ansible options set in /etc/ansible/hosts
+  gather_facts: false
+  vars:
+    transfer_tasks: yes
+  vars_files:
+    - ../vars/common.yml
+  roles:
+    - role: win_study
+      tags: win_study
diff --git a/ansible/roles/win_study/tasks/delete.yml b/ansible/roles/win_study/tasks/delete.yml
index 32f0782..ed56fa0 100644
--- a/ansible/roles/win_study/tasks/delete.yml
+++ b/ansible/roles/win_study/tasks/delete.yml
@@ -5,12 +5,20 @@
       ansible.windows.win_powershell:
         script: |
           Move-Item -Path "{{ study_folder }}" -Destination S:\Archived_Studies
+    
+    - name: Removing folders
+      block:
+        - name: Delete study folders on T drive
+          ansible.windows.win_file:
+            path: "T:\\{{ item }}\\{{ study_code }}"
+            state: absent
+          with_items: ["Import", "Export"]
 
-    - name: Delete study folders on T drive
-      ansible.windows.win_file:
-        path: "T:\\{{ item }}\\{{ study_code }}"
-        state: absent
-      with_items: ["Import", "Export"]
+        - name: Delete study folders on T drive
+          ansible.windows.win_file:
+            path: "T:\\{{ item }}\\{{ study_code }}"
+            state: absent
+          with_items: ["Import", "Export"]
 
     - name: Delete AD group
       community.windows.win_domain_group:
diff --git a/ansible/roles/win_study/tasks/main.yml b/ansible/roles/win_study/tasks/main.yml
index a9573c8..cc9317e 100644
--- a/ansible/roles/win_study/tasks/main.yml
+++ b/ansible/roles/win_study/tasks/main.yml
@@ -4,8 +4,17 @@
   loop: [check.yml, create.yml, permissions.yml]
   loop_control:
     loop_var: create_task
-  when: study_action == 'create'
+  when: 
+    - study_action == 'create'
+    - fileserver_tasks is defined
 
 - name: Study Deletion
   include_tasks: delete.yml
-  when: study_action == 'delete'
\ No newline at end of file
+  when: 
+    - study_action == 'delete'
+    - fileserver_tasks is defined
+
+- name: OS-Transfer Tasks
+  include_tasks: os-transfer.yml
+  when: 
+    - transfer_tasks is defined 
\ No newline at end of file
diff --git a/ansible/roles/win_study/tasks/os-transfer.yml b/ansible/roles/win_study/tasks/os-transfer.yml
new file mode 100644
index 0000000..da57297
--- /dev/null
+++ b/ansible/roles/win_study/tasks/os-transfer.yml
@@ -0,0 +1,13 @@
+---
+- name: Create Directories on os-transfer
+  file:
+    path: "{{ item }}"
+    state: directory
+  loop: "{{ mft_directories }}"
+  when: study_action == 'create'
+
+- name: Delete Directories on os-transfer
+  file:
+    path: "{{ mft_directory }}"
+    state: absent
+  when: study_action == 'delete'
\ No newline at end of file
diff --git a/ansible/roles/win_study/vars/main.yml b/ansible/roles/win_study/vars/main.yml
index e12b482..f907c28 100644
--- a/ansible/roles/win_study/vars/main.yml
+++ b/ansible/roles/win_study/vars/main.yml
@@ -4,3 +4,8 @@ import_folder: "{{ study_folder }}\\import"
 archive_folder: "{{ studydata_drive_letter }}:\\Archived_Studies"
 exporter_group: "{{ study_code }}-exporter"
 s_drive_folders: ["{{ study_folder }}", "{{ export_folder }}", "{{ import_folder }}"]
+
+mft_directory: /mnt/os-transfer/windows-mft/{{ os_project }}-{{ win_project }}/{{ study_code }}
+mft_export: "{{ mft_directory }}/Export"
+mft_import: "{{ mft_directory }}/Import"
+mft_directories: ["{{ mft_directory }}", "{{ mft_export }}", "{{ mft_import }}"]