diff --git a/data/common.yaml b/data/common.yaml new file mode 100644 index 0000000..a581abd --- /dev/null +++ b/data/common.yaml @@ -0,0 +1,9 @@ +--- +nfs::client_nfs_fstype: 'nfs' +nfs::client_services_hasrestart: true +nfs::client_services_hasstatus: true +nfs::client_gssd_options: '' +nfs::server_service_hasrestart: true +nfs::server_service_hasstatus: true +nfs::server_service_restart_cmd: ~ + diff --git a/data/os/Archlinux.yaml b/data/os/Archlinux.yaml new file mode 100644 index 0000000..45480a8 --- /dev/null +++ b/data/os/Archlinux.yaml @@ -0,0 +1,27 @@ +--- +nfs::exports_file: '/etc/exports' +nfs::idmapd_file: '/etc/idmapd.conf' +nfs::defaults_file: ~ +nfs::server_packages: + - 'nfs-utils' +nfs::client_packages: + - 'nfs-utils' + - 'nfsidmap' + - 'rpcbind' +nfs::client_rpcbind_config: ~ + +$nfs_v4_idmap_nobody_user = 'nobody' +$nfs_v4_idmap_nobody_group = 'nobody' +$client_rpcbind_optname = 'RPCNFSDARGS' +$client_gssdopt_name = 'RPCGSSDARGS' +$client_idmapd_setting = [''] +$client_nfs_options = 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=3,actimeo=3' +$client_services_enable = true +$client_services = { 'rpcbind' => {} } +$client_gssd_service_name = undef +$client_nfsv4_fstype = 'nfs4' +$client_nfsv4_options = 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=4,actimeo=3' +$client_nfsv4_services = { 'rpcbind' => {} } +$server_nfsv4_servicehelper = ['nfs-idmapd'] +$server_service_name = 'nfs-server.service' + diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml new file mode 100644 index 0000000..71f45db --- /dev/null +++ b/data/os/Debian.yaml @@ -0,0 +1,38 @@ +--- +nfs::exports_file: '/etc/exports' +nfs::idmapd_file: '/etc/idmapd.conf' +nfs::defaults_file: '/etc/default/nfs-common' +nfs::server_packages: + - 'nfs-common' + - 'nfs-kernel-server' + - 'nfs4-acl-tools' + - 'rpcbind' +nfs::client_packages: + - 'nfs-common' + - 'nfs4-acl-tools' + - 'rpcbind' +nfs::client_rpcbind_config: '/etc/default/rpcbind' + +nfs::client_idmapd_setting: + - 'set NEED_IDMAPD yes' +nfs::client_nfs_options: 'tcp,nolock,rsize:32768,wsize:32768,intr,noatime,nfsvers:3,actimeo:3' +nfs::client_services_enable: true +nfs::client_nfsv4_fstype: 'nfs4' +nfs::client_nfsv4_options: 'tcp,nolock,rsize:32768,wsize:32768,intr,noatime,actimeo:3' +nfs::nfs_v4_idmap_nobody_user: 'nobody' +nfs::nfs_v4_idmap_nobody_group: 'nogroup' +nfs::client_rpcbind_optname: 'OPTIONS' + +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': {} +nfs::server_nfsv4_servicehelper: + - 'idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Debian/10.yaml b/data/os/Debian/10.yaml new file mode 100644 index 0000000..2d51a45 --- /dev/null +++ b/data/os/Debian/10.yaml @@ -0,0 +1,18 @@ +--- +nfs::client_services: + 'rpcbind': + ensure: 'running' + enable: false +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': + ensure: 'running' + enable: false, +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Debian/11.yaml b/data/os/Debian/11.yaml new file mode 100644 index 0000000..2d51a45 --- /dev/null +++ b/data/os/Debian/11.yaml @@ -0,0 +1,18 @@ +--- +nfs::client_services: + 'rpcbind': + ensure: 'running' + enable: false +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': + ensure: 'running' + enable: false, +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Debian/7.yaml b/data/os/Debian/7.yaml new file mode 100644 index 0000000..39bffd8 --- /dev/null +++ b/data/os/Debian/7.yaml @@ -0,0 +1,13 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_nfsv4_services: + 'rpcbind': {} + 'nfs-common': + require: "Service['rpcbind']" +nfs::client_gssd_service_name: ~ +nfs::server_nfsv4_servicehelper: + - 'nfs-common' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'RPCGSSDOPTS' + diff --git a/data/os/Debian/8.yaml b/data/os/Debian/8.yaml new file mode 100644 index 0000000..39bffd8 --- /dev/null +++ b/data/os/Debian/8.yaml @@ -0,0 +1,13 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_nfsv4_services: + 'rpcbind': {} + 'nfs-common': + require: "Service['rpcbind']" +nfs::client_gssd_service_name: ~ +nfs::server_nfsv4_servicehelper: + - 'nfs-common' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'RPCGSSDOPTS' + diff --git a/data/os/Debian/9.yaml b/data/os/Debian/9.yaml new file mode 100644 index 0000000..2d51a45 --- /dev/null +++ b/data/os/Debian/9.yaml @@ -0,0 +1,18 @@ +--- +nfs::client_services: + 'rpcbind': + ensure: 'running' + enable: false +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': + ensure: 'running' + enable: false, +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Gentoo.yaml b/data/os/Gentoo.yaml new file mode 100644 index 0000000..a0f7159 --- /dev/null +++ b/data/os/Gentoo.yaml @@ -0,0 +1,34 @@ +--- +nfs::exports_file: '/etc/exports' +nfs::idmapd_file: '/etc/idmapd.conf' +nfs::defaults_file: '/etc/conf.d/nfs' +nfs::server_packages: + - 'net-nds/rpcbind' + - 'net-fs/nfs-utils' + - 'net-libs/libnfsidmap' +nfs::client_packages: + - 'net-nds/rpcbind' + - 'net-fs/nfs-utils' + - 'net-libs/libnfsidmap' +nfs::client_rpcbind_config: ~ + +nfs::nfs_v4_idmap_nobody_user: 'nobody' +nfs::nfs_v4_idmap_nobody_group: 'nogroup' +nfs::client_rpcbind_optname: 'OPTS_RPC_NFSD' +nfs::client_gssdopt_name: 'RPCGSSDARGS' +nfs::client_idmapd_setting: + - 'set NFS_NEEDED_SERVICES rpc.idmapd' +nfs::client_nfs_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=3,actimeo=3' +nfs::client_services_enable: true +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: ~ +nfs::client_nfsv4_fstype: 'nfs4' +nfs::client_nfsv4_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=4,actimeo=3' +nfs::client_nfsv4_services: + 'rpcbind': {} + 'rpc.idmapd': {} +nfs::server_nfsv4_servicehelper: + - 'rpc.idmapd' +nfs::server_service_name: 'nfs' + diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml new file mode 100644 index 0000000..aed9d80 --- /dev/null +++ b/data/os/RedHat.yaml @@ -0,0 +1,39 @@ +--- +nfs::exports_file: '/etc/exports' +nfs::idmapd_file: '/etc/idmapd.conf' +nfs::defaults_file: '/etc/sysconfig/nfs' +nfs::server_packages: + - 'nfs-utils' + - 'nfs4-acl-tools' + - 'rpcbind' +nfs::client_packages: + - 'nfs-utils' + - 'nfs4-acl-tools' + - 'rpcbind' +nfs::client_rpcbind_config: '/etc/sysconfig/rpcbind' + +nfs::nfs_v4_idmap_nobody_user: 'nobody' +nfs::nfs_v4_idmap_nobody_group: 'nobody' +nfs::client_rpcbind_optname: 'RPCBIND_ARGS' + +nfs::client_gssdopt_name: 'RPCGSSDARGS' +nfs::client_idmapd_setting: + - '' +nfs::client_nfs_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' +nfs::client_services_enable: true +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_fstype: 'nfs4' +nfs::client_nfsv4_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' +nfs::client_nfsv4_services: + 'rpcbind': {} + 'rpcidmapd': {} +nfs::server_nfsv4_servicehelper: + - 'rpcidmapd' + - 'rpcbind' +nfs::server_service_name: 'nfs' + diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml new file mode 100644 index 0000000..ad544c6 --- /dev/null +++ b/data/os/RedHat/7.yaml @@ -0,0 +1,22 @@ +--- +nfs::client_idmapd_setting: + - '' +nfs::client_nfs_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=3,actimeo=3' +nfs::client_services_enable: true +nfs::client_gssdopt_name: 'RPCGSSDARGS' +nfs::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-idmap.service' +server_service_name: 'nfs-server.service' + diff --git a/data/os/RedHat/8.yaml b/data/os/RedHat/8.yaml new file mode 100644 index 0000000..48f6177 --- /dev/null +++ b/data/os/RedHat/8.yaml @@ -0,0 +1,20 @@ +--- +nfs::client_idmapd_setting: + - '' +nfs::client_nfs_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' +nfs::client_services_enable: true +nfs::client_gssdopt_name: 'RPCGSSDARGS' +nfs::client_services: + 'rpcbind.service': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_fstype: 'nfs4' +nfs::client_nfsv4_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,actimeo=3' +nfs::client_nfsv4_services: + 'rpcbind': {} +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd.service' +nfs::server_service_name: 'nfs-server.service' + diff --git a/data/os/RedHat/9.yaml b/data/os/RedHat/9.yaml new file mode 100644 index 0000000..e668b6b --- /dev/null +++ b/data/os/RedHat/9.yaml @@ -0,0 +1,20 @@ +--- +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' + diff --git a/data/os/Suse.yaml b/data/os/Suse.yaml new file mode 100644 index 0000000..eeb9a9a --- /dev/null +++ b/data/os/Suse.yaml @@ -0,0 +1,34 @@ +--- +nfs::exports_file: '/etc/exports' +nfs::idmapd_file: '/etc/idmapd.conf' +nfs::defaults_file: ~ +nfs::server_packages: + - 'nfs-kernel-server' +nfs::client_packages: + - 'nfs-client' + - 'nfsidmap' + - 'rpcbind' +nfs::client_rpcbind_config: ~ + +$nfs_v4_idmap_nobody_user: 'nobody' +$nfs_v4_idmap_nobody_group: 'nobody' +$client_rpcbind_optname: 'RPCNFSDARGS' +$client_gssdopt_name: 'GSSD_OPTIONS' +$client_idmapd_setting: + - '' +$client_nfs_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=3,actimeo=3' +$client_services_enable: true +$client_services: + 'rpcbind': + before: "Service['nfs']" + 'nfs': {} +$client_gssd_service_name: ~ +$client_nfsv4_fstype: 'nfs4' +$client_nfsv4_options: 'tcp,nolock,rsize=32768,wsize=32768,intr,noatime,nfsvers=4,actimeo=3' +$client_nfsv4_services: + 'rpcbind': + before: "Service['nfs']" + 'nfs': {} +$server_nfsv4_servicehelper: ~ +$server_service_name: 'nfsserver' + diff --git a/data/os/Ubuntu/14.yaml b/data/os/Ubuntu/14.yaml new file mode 100644 index 0000000..1dca7f6 --- /dev/null +++ b/data/os/Ubuntu/14.yaml @@ -0,0 +1,12 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_nfsv4_services: + 'rpcbind': {} + 'nfs-common': + require: "Service['rpcbind']" +nfs::client_gssd_service_name: ~ +nfs::server_nfsv4_servicehelper: ~ +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'RPCGSSDOPTS' + diff --git a/data/os/Ubuntu/16.yaml b/data/os/Ubuntu/16.yaml new file mode 100644 index 0000000..2d51a45 --- /dev/null +++ b/data/os/Ubuntu/16.yaml @@ -0,0 +1,18 @@ +--- +nfs::client_services: + 'rpcbind': + ensure: 'running' + enable: false +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': + ensure: 'running' + enable: false, +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Ubuntu/17.yaml b/data/os/Ubuntu/17.yaml new file mode 100644 index 0000000..2d51a45 --- /dev/null +++ b/data/os/Ubuntu/17.yaml @@ -0,0 +1,18 @@ +--- +nfs::client_services: + 'rpcbind': + ensure: 'running' + enable: false +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': + ensure: 'running' + enable: false, +nfs::server_nfsv4_servicehelper: + - 'nfs-idmapd' +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Ubuntu/18.yaml b/data/os/Ubuntu/18.yaml new file mode 100644 index 0000000..84f7455 --- /dev/null +++ b/data/os/Ubuntu/18.yaml @@ -0,0 +1,13 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': {} +nfs::server_nfsv4_servicehelper: ~ +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Ubuntu/20.yaml b/data/os/Ubuntu/20.yaml new file mode 100644 index 0000000..84f7455 --- /dev/null +++ b/data/os/Ubuntu/20.yaml @@ -0,0 +1,13 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': {} +nfs::server_nfsv4_servicehelper: ~ +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/data/os/Ubuntu/22.yaml b/data/os/Ubuntu/22.yaml new file mode 100644 index 0000000..84f7455 --- /dev/null +++ b/data/os/Ubuntu/22.yaml @@ -0,0 +1,13 @@ +--- +nfs::client_services: + 'rpcbind': {} +nfs::client_gssd_service_name: + 'rpc-gssd': + ensure: 'running' + enable: true +nfs::client_nfsv4_services: + 'rpcbind': {} +nfs::server_nfsv4_servicehelper: ~ +nfs::server_service_name: 'nfs-kernel-server' +nfs::client_gssdopt_name: 'GSSDARGS' + diff --git a/hiera.yaml b/hiera.yaml new file mode 100644 index 0000000..545fff3 --- /dev/null +++ b/hiera.yaml @@ -0,0 +1,21 @@ +--- +version: 5 + +defaults: # Used for any hierarchy level that omits these keys. + datadir: data # This path is relative to hiera.yaml's directory. + data_hash: yaml_data # Use the built-in YAML backend. + +hierarchy: + - name: "osfamily/major release" + paths: + # Used to distinguish between Debian and Ubuntu + - "os/%{facts.os.name}/%{facts.os.release.major}.yaml" + - "os/%{facts.os.family}/%{facts.os.release.major}.yaml" + # Used for Solaris + - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml" + - name: "osfamily" + paths: + - "os/%{facts.os.name}.yaml" + - "os/%{facts.os.family}.yaml" + - name: 'common' + path: 'common.yaml' diff --git a/manifests/init.pp b/manifests/init.pp index 55f61af..f5c94b0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -169,51 +169,51 @@ Boolean $server_enabled = false, Boolean $client_enabled = false, Boolean $storeconfigs_enabled = true, - Boolean $nfs_v4 = $nfs::params::nfs_v4, - Boolean $nfs_v4_client = $nfs::params::nfs_v4, - Stdlib::Absolutepath $exports_file = $nfs::params::exports_file, - Stdlib::Absolutepath $idmapd_file = $nfs::params::idmapd_file, - Optional[Stdlib::Absolutepath] $defaults_file = $nfs::params::defaults_file, + Boolean $nfs_v4 = false, + Boolean $nfs_v4_client = false, + Stdlib::Absolutepath $exports_file, + Stdlib::Absolutepath $idmapd_file, + Optional[Stdlib::Absolutepath] $defaults_file, Boolean $manage_packages = true, - Array $server_packages = $nfs::params::server_packages, + Array $server_packages, String $server_package_ensure = 'installed', - Array $client_packages = $nfs::params::client_packages, + Array $client_packages, String $client_package_ensure = 'installed', Boolean $manage_server_service = true, Boolean $manage_server_servicehelper = true, Boolean $manage_client_service = true, - String $server_service_name = $nfs::params::server_service_name, + String $server_service_name, Enum['present', 'absent', 'running', 'stopped', 'disabled'] $server_service_ensure = 'running', Boolean $server_service_enable = true, - Boolean $server_service_hasrestart = $nfs::params::server_service_hasrestart, - Boolean $server_service_hasstatus = $nfs::params::server_service_hasstatus, - Optional[String] $server_service_restart_cmd = $nfs::params::server_service_restart_cmd, - Optional[Array] $server_nfsv4_servicehelper = $nfs::params::server_nfsv4_servicehelper, - Hash $client_services = $nfs::params::client_services, - Hash $client_nfsv4_services = $nfs::params::client_nfsv4_services, - Boolean $client_services_enable = $nfs::params::client_services_enable, - Boolean $client_services_hasrestart = $nfs::params::client_services_hasrestart, - Boolean $client_services_hasstatus = $nfs::params::client_services_hasstatus, - Array[String] $client_idmapd_setting = $nfs::params::client_idmapd_setting, - String $client_nfs_fstype = $nfs::params::client_nfs_fstype, - String $client_nfs_options = $nfs::params::client_nfs_options, - String $client_nfsv4_fstype = $nfs::params::client_nfsv4_fstype, - String $client_nfsv4_options = $nfs::params::client_nfsv4_options, + Boolean $server_service_hasrestart, + Boolean $server_service_hasstatus, + Optional[String] $server_service_restart_cmd, + Optional[Array] $server_nfsv4_servicehelper, + Hash $client_services, + Hash $client_nfsv4_services, + Boolean $client_services_enable, + Boolean $client_services_hasrestart, + Boolean $client_services_hasstatus, + Array[String] $client_idmapd_setting, + String $client_nfs_fstype, + String $client_nfs_options, + String $client_nfsv4_fstype, + String $client_nfsv4_options, Boolean $client_need_gssd = false, Boolean $client_gssd_service = false, - Optional[Hash] $client_gssd_service_name = $nfs::params::client_gssd_service_name, - String $client_gssd_options = $nfs::params::client_gssd_options, - String $client_gssdopt_name = $nfs::params::client_gssdopt_name, + Optional[Hash] $client_gssd_service_name, + String $client_gssd_options, + String $client_gssdopt_name, Boolean $client_d9_gssdopt_workaround = false, - String $nfs_v4_export_root = $nfs::params::nfs_v4_export_root, - String $nfs_v4_export_root_clients = $nfs::params::nfs_v4_export_root_clients, - String $nfs_v4_mount_root = $nfs::params::nfs_v4_mount_root, - String $nfs_v4_idmap_domain = $nfs::params::nfs_v4_idmap_domain, + String $nfs_v4_export_root = '/export', + String $nfs_v4_export_root_clients = "*.${facts['networking']['domain']}(ro,fsid=root,insecure,no_subtree_check,async,root_squash)", + String $nfs_v4_mount_root = '/srv', + String $nfs_v4_idmap_domain = pick($facts['networking']['domain'], 'example.org'), Variant[String, Array] $nfs_v4_idmap_localrealms = '', # lint:ignore:params_empty_string_assignment Integer $nfs_v4_idmap_cache = 0, Boolean $manage_nfs_v4_idmap_nobody_mapping = false, - String $nfs_v4_idmap_nobody_user = $nfs::params::nfs_v4_idmap_nobody_user, - String $nfs_v4_idmap_nobody_group = $nfs::params::nfs_v4_idmap_nobody_group, + String $nfs_v4_idmap_nobody_user, + String $nfs_v4_idmap_nobody_group, String $nfs_v4_root_export_ensure = 'mounted', Optional[String] $nfs_v4_root_export_mount = undef, Boolean $nfs_v4_root_export_remounts = false, @@ -222,10 +222,10 @@ Optional[String] $nfs_v4_root_export_bindmount = undef, Optional[String] $nfs_v4_root_export_tag = undef, Boolean $nfsv4_bindmount_enable = true, - Optional[Stdlib::Absolutepath] $client_rpcbind_config = $nfs::params::client_rpcbind_config, - Optional[String] $client_rpcbind_optname = $nfs::params::client_rpcbind_optname, + Optional[Stdlib::Absolutepath] $client_rpcbind_config, + Optional[String] $client_rpcbind_optname, Optional[String] $client_rpcbind_opts = undef, -) inherits nfs::params { +) { if $server_enabled { if $server_nfsv4_servicehelper != undef { $effective_nfsv4_client_services = delete($client_nfsv4_services, $server_nfsv4_servicehelper) diff --git a/manifests/params.pp b/manifests/params.pp index 416e0c7..f442066 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,16 +15,16 @@ class nfs::params { #### Default values for the parameters of the main module class, init.pp - $nfs_v4 = false - $nfs_v4_export_root = '/export' - $nfs_v4_export_root_clients = "*.${facts['networking']['domain']}(ro,fsid=root,insecure,no_subtree_check,async,root_squash)" - $nfs_v4_mount_root = '/srv' + # $nfs_v4 = false + # $nfs_v4_export_root = '/export' + # $nfs_v4_export_root_clients = "*.${facts['networking']['domain']}(ro,fsid=root,insecure,no_subtree_check,async,root_squash)" + # $nfs_v4_mount_root = '/srv' - if $facts['networking']['domain'] != undef { - $nfs_v4_idmap_domain = $facts['networking']['domain'] - } else { - $nfs_v4_idmap_domain = 'example.org' - } + # if $facts['networking']['domain'] != undef { + # $nfs_v4_idmap_domain = $facts['networking']['domain'] + # } else { + # $nfs_v4_idmap_domain = 'example.org' + # } # Different path and package definitions case $facts['os']['family'] {