YDA-6166: only mount NFS shares if host matches

UtrechtUniversity · Feb 28, 2025 · c073860 · c073860
1 parent 16577f2
commit c073860
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/environments/development/allinone/group_vars/allinone.yml b/environments/development/allinone/group_vars/allinone.yml
@@ -190,11 +190,14 @@ s3_hostname: localhost:9000
 # NFS configuration
 enable_nfs_resource: true
 nfs_mounts:
-  - src: "{{ ansible_host }}:/var/nfs/Vault1_1"
+  - host: combined.yoda.test
+    src: "{{ ansible_host }}:/var/nfs/Vault1_1"
     path: "/nfs/Vault1_1"
-  - src: "{{ ansible_host }}:/var/nfs/Vault1_2"
+  - host: combined.yoda.test
+    src: "{{ ansible_host }}:/var/nfs/Vault1_2"
     path: "/nfs/Vault1_2"
-  - src: "{{ ansible_host }}:/var/nfs/Vault2_1"
+  - host: combined.yoda.test
+    src: "{{ ansible_host }}:/var/nfs/Vault2_1"
     path: "/nfs/Vault2_1"
 
 # Mail notifications

diff --git a/roles/nfs_client/defaults/main.yml b/roles/nfs_client/defaults/main.yml
@@ -5,9 +5,12 @@ nfs_mounts:
 
 # Example configuration for development environment.
 # nfs_mounts:
-#   - src: "{{ ansible_host }}:/var/nfs/Vault1_1"
+#  - host: combined.yoda.test
+#    src: "{{ ansible_host }}:/var/nfs/Vault1_1"
 #    path: "/nfs/Vault1_1"
-#  - src: "{{ ansible_host }}:/var/nfs/Vault1_2"
+#  - host: combined.yoda.test
+#    src: "{{ ansible_host }}:/var/nfs/Vault1_2"
 #    path: "/nfs/Vault1_2"
-#  - src: "{{ ansible_host }}:/var/nfs/Vault2_1"
+#  - host: combined.yoda.test
+#    src: "{{ ansible_host }}:/var/nfs/Vault2_1"
 #    path: "/nfs/Vault2_1"
diff --git a/roles/nfs_client/tasks/main.yml b/roles/nfs_client/tasks/main.yml
@@ -23,6 +23,7 @@
     group: irods
     mode: '0755'
   loop: "{{ nfs_mounts if nfs_mounts is iterable else [] }}"
+  when: item.host == ansible_fqdn
 
 
 - name: Ensure NFS shares are mounted and present in /etc/fstab
@@ -35,3 +36,4 @@
     dump: 0
     passno: 0
   loop: "{{ nfs_mounts if nfs_mounts is iterable else [] }}"
+  when: item.host == ansible_fqdn