Merge branch 'master' of https://github.com/derdanne/puppet-nfs into …

…create_parent_directories_for_nfs_exports
voxpupuli · Sep 15, 2022 · 428bfe4 · 428bfe4
2 parents 22077f2 + 8dd2ad0
commit 428bfe4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git 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 {

diff --git 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}"],
     }
   }

diff --git 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      = ['']

diff --git 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