Merge branch 'th/nfs-automount' into 'master'

nfs-client: Use systemd’s automount feature instead of autofs

See merge request !13

nfs-client/tasks/main.yml

@@ -4,8 +4,6 @@
   apt:
     name:
       - nfs-common
-      - libgssrpc4
-      - autofs
     state: present
   tags:
     - nfs-client
@@ -37,7 +35,6 @@
     mode: '0644'
   notify:
     - restart nfs-client
-    - restart autofs
   tags:
     - nfs-client
 
@@ -45,34 +42,8 @@
   modprobe:
     name: nfs
     state: present
-  tags:
-    - nfs-client
-
-- name: ensure nfs module is loaded after a reboot
-  copy:
-    content: "nfs"
-    dest: /etc/modules-load.d/nfs.conf
-  tags:
-    - nfs-client
-
-- name: ensure we use the idmapper
-  copy:
-    content: "N"
-    dest: /sys/module/nfs/parameters/nfs4_disable_idmapping
-    unsafe_writes: true
-  notify:
-    - restart nfs-client
-    - restart autofs
-  tags:
-    - nfs-client
-
-- name: ensure we use the idmapper after a reboot
-  copy:
-    src: modprobe-nfs.conf
-    dest: /etc/modprobe.d/nfs.conf
-    owner: root
-    group: root
-    mode: '0644'
+    params: nfs4_disable_idmapping=N
+    persistent: present
   tags:
     - nfs-client
 
@@ -91,79 +62,37 @@
   tags:
     - nfs-client
 
-- name: Configure automount
-  when: automount
-  block:
-    - name: ensure there is a base directory for automount
-      file:
-        state: directory
-        path: /net
-        owner: root
-        group: root
-        mode: '0755'
-      notify:
-        - restart autofs
-      tags:
-        - nfs-client
-
-    - name: ensure automounter is configured
-      copy:
-        src: auto.master
-        dest: /etc/auto.master
-        owner: root
-        group: root
-        mode: '0644'
-      notify:
-        - restart autofs
-      tags:
-        - nfs-client
-
-    - name: ensure mounts from central storage are available
-      template:
-        src: auto.nfs.j2
-        dest: /etc/auto.nfs
-        owner: root
-        group: root
-        mode: '0644'
-      notify:
-        - restart autofs
-      tags:
-        - nfs-client
-
-    - name: ensure automounter is enabled
-      service:
+- name: Disable and stop autofs
+  systemd:
     name: autofs
-        state: started
-        enabled: true
+    state: stopped
+    enabled: false
+  ignore_errors: true
   tags:
     - nfs-client
 
-    - name: ensure linking of netdirs
+- name: Remove old autofs directory
   file:
-        src: "/net/{{ item.netdir }}"
-        dest: "/{{ item.dest }}"
-        state: link
-        force: true
-      with_items: "{{ nfs_shares }}"
+    path: /net
+    state: absent
   tags:
     - nfs-client
 
-- name: Configure fstab nfs mounts
-  when: not automount
-  block:
-    - name: Disable automounter
-      service:
-        name: autofs
-        state: stopped
-        enabled: false
+- name: Ensure /home is a directory
+  file:
+    path: /home
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
   tags:
     - nfs-client
 
 - name: Ensure mountpoints are directories
   file:
-        path: "/{{ item.dest }}"
+    path: "{{ item.dest }}"
     state: directory
-      with_items: "{{ nfs_shares }}"
+  loop: "{{ nfs_shares }}"
   tags:
     - nfs-client
 
@@ -171,10 +100,15 @@
   mount:
     fstype: "nfs"
     src: "{{ item.src }}"
-        path: "/{{ item.dest }}"
-        opts: "{{ item.options }}"
+    path: "{{ item.dest }}"
+    opts: "{{ item.options }}{{ maybe_automount }}"
     state: mounted
-      with_items: "{{ nfs_shares }}"
+  loop: "{{ nfs_shares }}"
+  vars:
+    maybe_automount: >-
+      {% if automount -%}
+      ,x-systemd.automount
+      {%- endif %}
   tags:
     - nfs-client