[PATCH v2 05/10] nfsd: add a pipefs-directory config to nfs.conf

[Scott Mayhew <smayhew@redhat.com>]

Debian uses /run/rpc_pipefs for the pipefs mountpoint by default, but
the nfs.conf that we deploy doesn't have a pipefs-directory
configuration.

That will cause any userspace daemons that use the pipefs to fail to
start/restart because they'll now be looking for the pipefs to be
mounted on /var/lib/nfs/rpc_pipefs... unless we reboot the nfsd server
after we overwrite Debian's default nfs.conf with our own.

So let's just add the pipefs-directory configuration to nfs.conf
instead.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 playbooks/roles/nfsd/templates/nfs.conf.j2 | 3 +++
 playbooks/roles/nfsd/vars/Debian.yml       | 2 ++
 playbooks/roles/nfsd/vars/RedHat.yml       | 2 ++
 playbooks/roles/nfsd/vars/Suse.yml         | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/playbooks/roles/nfsd/templates/nfs.conf.j2 b/playbooks/roles/nfsd/templates/nfs.conf.j2
index 2396f429..8e89eba4 100644
--- a/playbooks/roles/nfsd/templates/nfs.conf.j2
+++ b/playbooks/roles/nfsd/templates/nfs.conf.j2
@@ -1,3 +1,6 @@
+[general]
+pipefs-directory={{ pipefs_directory }}
+
 [nfsd]
 udp=y
 threads={{ nfsd_threads }}
diff --git a/playbooks/roles/nfsd/vars/Debian.yml b/playbooks/roles/nfsd/vars/Debian.yml
index 3bb9e810..d8aa50bc 100644
--- a/playbooks/roles/nfsd/vars/Debian.yml
+++ b/playbooks/roles/nfsd/vars/Debian.yml
@@ -9,3 +9,5 @@ fstype_userspace_progs:
   btrfs: btrfs-progs
   ext4: e2fsprogs
   xfs: xfsprogs
+
+pipefs_directory: /run/rpc_pipefs
diff --git a/playbooks/roles/nfsd/vars/RedHat.yml b/playbooks/roles/nfsd/vars/RedHat.yml
index 590818ca..091c827c 100644
--- a/playbooks/roles/nfsd/vars/RedHat.yml
+++ b/playbooks/roles/nfsd/vars/RedHat.yml
@@ -10,3 +10,5 @@ fstype_userspace_progs:
   btrfs: btrfs-progs
   ext4: e2fsprogs
   xfs: xfsprogs
+
+pipefs_directory: /var/lib/nfs/rpc_pipefs
diff --git a/playbooks/roles/nfsd/vars/Suse.yml b/playbooks/roles/nfsd/vars/Suse.yml
index 73b06c83..786e5f81 100644
--- a/playbooks/roles/nfsd/vars/Suse.yml
+++ b/playbooks/roles/nfsd/vars/Suse.yml
@@ -8,3 +8,5 @@ fstype_userspace_progs:
   btrfs: btrfsprogs
   ext4: e2fsprogs
   xfs: xfsprogs
+
+pipefs_directory: /var/lib/nfs/rpc_pipefs
-- 
2.43.0