From c2f5723736f76aad4b7b6b9c043c047660dc8eef Mon Sep 17 00:00:00 2001
From: Alice Grosch <a.grosch@fz-juelich.de>
Date: Fri, 24 Nov 2023 17:09:20 +0100
Subject: [PATCH] Add userhome nfs

---
 managed_clusters/userdata_usernode.yaml | 4 +++-
 managed_clusters/userdata_worker.yaml   | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/managed_clusters/userdata_usernode.yaml b/managed_clusters/userdata_usernode.yaml
index a3b616f..0615a1b 100644
--- a/managed_clusters/userdata_usernode.yaml
+++ b/managed_clusters/userdata_usernode.yaml
@@ -47,7 +47,9 @@ runcmd:
   - echo "$(date) - Configure autofs" >> /home/ubuntu/start.log
   - systemctl stop autofs
   - mkdir -p /p/software/jsccloud
-  - echo "/p/software/jsccloud -fstype=nfs,rw,vers=4,minorversion=2,proto=tcp,hard,nobind,rsize=32768,wsize=32768,nodiratime,fsc,timeo=100,noatime,nosuid,intr,nodev 10.0.2.249:/p/software" >> /etc/auto.nfs
+  - mkdir -p /p/home/jusers
+  - echo "/p/software/jsccloud -fstype=nfs,rw,vers=4,minorversion=2,proto=tcp,hard,nobind,rsize=32768,wsize=32768,nodiratime,fsc,timeo=100,noatime,nosuid,intr,nodev 10.0.2.249:/p/software/jsccloud" >> /etc/auto.nfs
+  - echo "/p/home/jusers -fstype=nfs,rw,vers=4,minorversion=2,proto=tcp,hard,nobind,rsize=32768,wsize=32768,nodiratime,fsc,timeo=100,noatime,nosuid,intr,nodev 10.0.2.249:/p/home/jusers" >> /etc/auto.nfs
   - echo "$(date) - Enable autofs" >> /home/ubuntu/start.log
   - echo "/- /etc/auto.nfs --ghost --timeout=86400" >> /etc/auto.master
   - systemctl enable --now autofs
diff --git a/managed_clusters/userdata_worker.yaml b/managed_clusters/userdata_worker.yaml
index 8dc25a2..8e4bf71 100644
--- a/managed_clusters/userdata_worker.yaml
+++ b/managed_clusters/userdata_worker.yaml
@@ -39,11 +39,18 @@ runcmd:
   - echo "$(date) - Set containerd and docker packages on hold" >> /home/ubuntu/start.log
   - apt-mark hold containerd.io docker-compose-plugin docker-scan-plugin docker-ce docker-ce-cli docker-ce-rootless-extras
   - echo "$(date) - Install custom packages" >> /home/ubuntu/start.log
-  - apt update && apt install -yq jq net-tools nfs-common sudo sysstat unattended-upgrades
+  - apt update && apt install -yq jq net-tools nfs-common autofs sudo sysstat unattended-upgrades
   - echo "$(date) - Install custom packages done" >> /home/ubuntu/start.log
   - echo "$(date) - Upgrade all packages" >> /home/ubuntu/start.log
   - apt update && apt upgrade -yq
   - echo "$(date) - Upgrade all packages done" >> /home/ubuntu/start.log
+  - echo "$(date) - Configure autofs" >> /home/ubuntu/start.log
+  - systemctl stop autofs
+  - mkdir -p /p/home/jusers
+  - echo "/p/home/jusers -fstype=nfs,rw,vers=4,minorversion=2,proto=tcp,hard,nobind,rsize=32768,wsize=32768,nodiratime,fsc,timeo=100,noatime,nosuid,intr,nodev 10.0.2.249:/p/home/jusers" >> /etc/auto.nfs
+  - echo "$(date) - Enable autofs" >> /home/ubuntu/start.log
+  - echo "/- /etc/auto.nfs --ghost --timeout=86400" >> /etc/auto.master
+  - systemctl enable --now autofs
   - echo "$(date) - Enable sysstat" >> /home/ubuntu/start.log
   - systemctl enable --now sysstat
   - echo "$(date) - Start script done" >> /home/ubuntu/start.log
-- 
GitLab