From 073b8d00138eadbd4ae1e3f6ac5acf48e6c0b5ad Mon Sep 17 00:00:00 2001 From: Brian Schonecker Date: Mon, 16 May 2022 14:55:36 -0400 Subject: [PATCH 1/4] Update README.md (#147) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 497779e9..70ee748e 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ On a client the following code is sufficient: ### Simple NFSv3 server and client example -This will export /data/folder on the server and automagically mount it on client. +This will export /data_folder on the server and automagically mount it on client. ```puppet node server { From 26544d659b337602e815113ec23fb6266f429986 Mon Sep 17 00:00:00 2001 From: Joris Van Acoleyen Date: Tue, 31 May 2022 20:41:14 +0200 Subject: [PATCH 2/4] Make ensure check more efficient (#145) * Update mount.pp --- manifests/client/mount.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/client/mount.pp b/manifests/client/mount.pp index 9c44007a..0ebce331 100644 --- a/manifests/client/mount.pp +++ b/manifests/client/mount.pp @@ -155,12 +155,13 @@ } } - if $owner != undef or $group != undef or $mode != undef or $ensure != absent { + if $owner != undef or $group != undef or $mode != undef { file { $mount: - ensure => directory, + ensure => $ensure == absent ? { true => 'absent', default => 'directory' }, owner => $owner, group => $group, mode => $mode, + force => true, require => Mount["shared ${sharename} by ${server} on ${mount}"], } } From 7f56c5b73c898b368a404cdbb7c2384d49dcf1e4 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Sat, 10 Sep 2022 14:03:04 +0200 Subject: [PATCH 3/4] Add RHEL/CentOS 9 support (#150) --- manifests/params.pp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index 76c126d4..d1ec0eca 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -245,6 +245,23 @@ $server_nfsv4_servicehelper = [ 'nfs-idmapd.service' ] $server_service_name = 'nfs-server.service' } + '9': { + $client_idmapd_setting = [''] + $client_nfs_options = 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' + $client_services_enable = true + $client_gssdopt_name = 'RPCGSSDARGS' + $client_services = {'rpcbind.service' => {}} + $client_gssd_service_name = { 'rpc-gssd' => { + ensure => 'running', + enable => true, + }, + } + $client_nfsv4_fstype = 'nfs4' + $client_nfsv4_options = 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' + $client_nfsv4_services = {'rpcbind' => {}} + $server_nfsv4_servicehelper = [ 'nfs-idmapd.service' ] + $server_service_name = 'nfs-server.service' + } default: { $client_gssdopt_name = 'RPCGSSDARGS' $client_idmapd_setting = [''] From 8dd2ad06879b09672e73a0090433bcdb1c76cef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Klockenk=C3=A4mper?= Date: Sat, 10 Sep 2022 15:03:07 +0200 Subject: [PATCH 4/4] fix: install additional packages for rspec-beaker tests on ubuntu (#151) --- spec/acceptance/nodesets/ubuntu-18.04.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/nodesets/ubuntu-18.04.yml b/spec/acceptance/nodesets/ubuntu-18.04.yml index 093c7872..f6c4e402 100644 --- a/spec/acceptance/nodesets/ubuntu-18.04.yml +++ b/spec/acceptance/nodesets/ubuntu-18.04.yml @@ -2,12 +2,12 @@ HOSTS: ubuntu-1804-x64: platform: ubuntu-18.04-amd64 hypervisor: docker - image: ubuntu:18.04 + image: ubuntu:bionic-20220531 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y distro-info-data locales lsb-release && locale-gen en_US.UTF-8' + - 'apt-get update && apt-get install -y init distro-info-data locales lsb-release && locale-gen en_US.UTF-8' # for local development - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' # exportfs does not work on overlayfs - mounting local filesystem