From 3bcd09fb5e0901a844e7178dcc1c8abb9b514677 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Thu, 12 Oct 2017 16:02:15 +0200 Subject: [PATCH] nfs-client: Make role compatible with newer Debian releases - The "nfs-common" service is masked in systemd - More recent systems use /run/rpc_pipefs --- roles/nfs-client/defaults/main.yml | 2 ++ roles/nfs-client/handlers/main.yml | 1 + roles/nfs-client/tasks/main.yml | 1 + roles/nfs-client/templates/idmapd.conf.j2 | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/nfs-client/defaults/main.yml b/roles/nfs-client/defaults/main.yml index 199bc5f..a043a05 100644 --- a/roles/nfs-client/defaults/main.yml +++ b/roles/nfs-client/defaults/main.yml @@ -2,3 +2,5 @@ # nfs-client defaults nfs_client_domain: "{{ ansible_domain }}" + +rpc_pipefs: "{{ '/var/lib/nfs/rpc_pipefs' if ansible_distribution_major_version < '8' else '/run/rpc_pipefs' }}" diff --git a/roles/nfs-client/handlers/main.yml b/roles/nfs-client/handlers/main.yml index bb3d6ed..2e1845d 100644 --- a/roles/nfs-client/handlers/main.yml +++ b/roles/nfs-client/handlers/main.yml @@ -5,3 +5,4 @@ service: > name=nfs-common state=restarted + when: "ansible_distribution_major_version < '8'" diff --git a/roles/nfs-client/tasks/main.yml b/roles/nfs-client/tasks/main.yml index 46087ef..b00c223 100644 --- a/roles/nfs-client/tasks/main.yml +++ b/roles/nfs-client/tasks/main.yml @@ -29,3 +29,4 @@ enabled=yes name=nfs-common state=started + when: "ansible_distribution_major_version < '8'" diff --git a/roles/nfs-client/templates/idmapd.conf.j2 b/roles/nfs-client/templates/idmapd.conf.j2 index 92415c6..7f50ab7 100644 --- a/roles/nfs-client/templates/idmapd.conf.j2 +++ b/roles/nfs-client/templates/idmapd.conf.j2 @@ -5,7 +5,7 @@ [General] Domain = {{ nfs_client_domain }} -Pipefs-Directory = /var/lib/nfs/rpc_pipefs +Pipefs-Directory = {{ rpc_pipefs}} Verbosity = 0 [Mapping] -- 2.39.2