From a911929a5c36afee96648eec7898a9234ae70b97 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 19 Apr 2024 09:59:30 +0000
Subject: [PATCH] Rework win_tranfer to role from playbook

---
 ansible/playbooks/win_transfer.yml            |  9 +++
 ansible/playbooks/win_transfer/mount-data.yml | 56 -------------------
 ansible/roles/win_transfer/tasks/main.yml     |  2 +
 ansible/roles/win_transfer/tasks/mount.yml    | 29 ++++++++++
 .../win_transfer/templates/smb-credentials.j2 |  2 +
 ansible/roles/win_transfer/vars/main.yml      |  2 +
 6 files changed, 44 insertions(+), 56 deletions(-)
 create mode 100644 ansible/playbooks/win_transfer.yml
 delete mode 100644 ansible/playbooks/win_transfer/mount-data.yml
 create mode 100644 ansible/roles/win_transfer/tasks/main.yml
 create mode 100644 ansible/roles/win_transfer/tasks/mount.yml
 create mode 100644 ansible/roles/win_transfer/templates/smb-credentials.j2
 create mode 100644 ansible/roles/win_transfer/vars/main.yml

diff --git a/ansible/playbooks/win_transfer.yml b/ansible/playbooks/win_transfer.yml
new file mode 100644
index 0000000..e905112
--- /dev/null
+++ b/ansible/playbooks/win_transfer.yml
@@ -0,0 +1,9 @@
+---
+- hosts: "meta-name_fs01"
+  # many ansible options set in /etc/ansible/hosts
+  gather_facts: false
+  vars_files:
+    - ../vars/common.yml
+  roles:
+    - role: win_transfer
+      tags: win_transfer
\ No newline at end of file
diff --git a/ansible/playbooks/win_transfer/mount-data.yml b/ansible/playbooks/win_transfer/mount-data.yml
deleted file mode 100644
index 620af76..0000000
--- a/ansible/playbooks/win_transfer/mount-data.yml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-- hosts: "meta-name_fs01"
-  remote_user: skylight-rundeck
-  become: yes
-  gather_facts: false
-  vars_files:
-    - ../../vars/common.yml
-  vars:
-    credentials_file: "/root/windows-envs/.{{ os_project }}-{{ win_project }}-smbcredentials"
-  tasks:
-    - name: Configure
-      tags: configure_mount
-      block:
-        - name: Create the mount point
-          file:
-            path: "/mnt/windows/{{ os_project }}-{{ win_project }}"
-            state: directory
-            mode: "0770"
-            owner: sg-transfer
-            group: sg-transfer
-          delegate_to: os-transfer
-
-        - name: Create credential file
-          file:
-            path: "{{ credentials_file }}"
-            state: touch
-            owner: root
-            group: root
-            mode: '0600'
-          delegate_to: os-transfer
-
-        - name: Write username into the credentials file
-          lineinfile:
-            path: "{{ credentials_file }}"
-            line: username=file-transfer@{{ win_project }}.loc
-            create: yes
-          delegate_to: os-transfer
-
-        - name: Write password into the credentials file
-          lineinfile:
-            path: "{{ credentials_file }}"
-            line: password={{ transfer_user_password }}
-            create: yes
-          delegate_to: os-transfer
-
-    - name: Mount Data
-      tags: mount_data
-      block:
-        - name: Mount filesystem on os-transfer
-          ansible.posix.mount:
-            src: "//{{ hostvars[inventory_hostname].ansible_host }}/File_Transfer"
-            path: "/mnt/windows/{{ os_project }}-{{ win_project }}"
-            opts: "credentials={{ credentials_file }},iocharset=utf8"
-            state: mounted
-            fstype: cifs
-          delegate_to: os-transfer
diff --git a/ansible/roles/win_transfer/tasks/main.yml b/ansible/roles/win_transfer/tasks/main.yml
new file mode 100644
index 0000000..03568d8
--- /dev/null
+++ b/ansible/roles/win_transfer/tasks/main.yml
@@ -0,0 +1,2 @@
+---
+- import_tasks: mount.yml
diff --git a/ansible/roles/win_transfer/tasks/mount.yml b/ansible/roles/win_transfer/tasks/mount.yml
new file mode 100644
index 0000000..b9d8e4a
--- /dev/null
+++ b/ansible/roles/win_transfer/tasks/mount.yml
@@ -0,0 +1,29 @@
+---
+- name: Setup Mount
+  tags: setup_mount
+  block:
+    - name: Create the mount point
+      file:
+        path: "{{ mount_directory }}"
+        state: directory
+        mode: "0770"
+        owner: sg-transfer
+        group: sg-transfer
+
+    - name: Copy smb-credential template to os-transfer
+      template:
+        dest: "{{ credentials_path }}"
+        src: smb-credentials.j2
+  delegate_to: os-transfer
+
+- name: Mount Filesystem
+  tags: mount_filesystem
+  block:
+    - name: Mount filesystem on os-transfer
+      ansible.posix.mount:
+        src: "//{{ hostvars[inventory_hostname].ansible_host }}/File_Transfer"
+        path: "{{ mount_directory }}"
+        opts: "credentials={{ credentials_path }},iocharset=utf8"
+        state: mounted
+        fstype: cifs
+  delegate_to: os-transfer
\ No newline at end of file
diff --git a/ansible/roles/win_transfer/templates/smb-credentials.j2 b/ansible/roles/win_transfer/templates/smb-credentials.j2
new file mode 100644
index 0000000..a8a724f
--- /dev/null
+++ b/ansible/roles/win_transfer/templates/smb-credentials.j2
@@ -0,0 +1,2 @@
+username=file-transfer@{{ win_project }}.loc
+password={{ transfer_user_password }}
\ No newline at end of file
diff --git a/ansible/roles/win_transfer/vars/main.yml b/ansible/roles/win_transfer/vars/main.yml
new file mode 100644
index 0000000..08d1dd1
--- /dev/null
+++ b/ansible/roles/win_transfer/vars/main.yml
@@ -0,0 +1,2 @@
+mount_directory: /mnt/windows/{{ os_project }}-{{ win_project }}
+credentials_path: /root/windows-envs/.{{ os_project }}-{{ win_project }}-smbcredentials
\ No newline at end of file