From 73c3fc769d858b88e17278abb09adfa79e1e8d38 Mon Sep 17 00:00:00 2001
From: Vladimir Still <git@vstill.eu>
Date: Sun, 23 Jan 2022 18:45:50 +0100
Subject: [PATCH] ansible: Drop deprecated intr option for NFS mounts
---
ansible/roles/pds_mount/templates/auto.antea.j2 | 2 +-
ansible/roles/pds_mount/templates/auto.home.j2 | 2 +-
ansible/roles/pds_mount/templates/auto.pontos.j2 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/pds_mount/templates/auto.antea.j2 b/ansible/roles/pds_mount/templates/auto.antea.j2
index 6340d82..42bcb5a 100644
--- a/ansible/roles/pds_mount/templates/auto.antea.j2
+++ b/ansible/roles/pds_mount/templates/auto.antea.j2
@@ -1,2 +1,2 @@
# managed by ansible
-* -rw,soft,intr,actimeo=30,noatime,vers=3 antea.fi.muni.cz:/home/&
+* -rw,soft,actimeo=30,noatime,vers=3 antea.fi.muni.cz:/home/&
diff --git a/ansible/roles/pds_mount/templates/auto.home.j2 b/ansible/roles/pds_mount/templates/auto.home.j2
index c1a1129..8e5ed8e 100644
--- a/ansible/roles/pds_mount/templates/auto.home.j2
+++ b/ansible/roles/pds_mount/templates/auto.home.j2
@@ -7,7 +7,7 @@
{% if hostname + ".fi.muni.cz" == inventory_hostname %}
{{usr}} -fstype=bind :/export/home/{{usr}}
{% else %}
-{{usr}} -rw,soft,intr,actimeo=30,noatime,vers=3 {{hostname}}.fi.muni.cz:{{prefix}}/home/{{usr}}
+{{usr}} -rw,soft,actimeo=30,noatime,vers=3 {{hostname}}.fi.muni.cz:{{prefix}}/home/{{usr}}
{% endif %}
{% endfor %}
{% endfor %}
diff --git a/ansible/roles/pds_mount/templates/auto.pontos.j2 b/ansible/roles/pds_mount/templates/auto.pontos.j2
index f386c87..268690d 100644
--- a/ansible/roles/pds_mount/templates/auto.pontos.j2
+++ b/ansible/roles/pds_mount/templates/auto.pontos.j2
@@ -4,7 +4,7 @@
{% if "pontos" + num + ".fi.muni.cz" == inventory_hostname %}
{{usr}} -fstype=bind :/export/home/{{usr}}
{% else %}
-{{usr}} -rw,soft,intr,actimeo=30,noatime,vers=3 pontos{{num}}.fi.muni.cz:/export/home/{{usr}}
+{{usr}} -rw,soft,actimeo=30,noatime,vers=3 pontos{{num}}.fi.muni.cz:/export/home/{{usr}}
{% endif %}
{% endfor %}
{% endfor %}
--
GitLab