Skip to content
This repository was archived by the owner on Mar 8, 2023. It is now read-only.

Commit f8f2dec

Browse files
dwerderdwerder
committed
Merge pull request #25 from haw-hh-ai-lab/configurable_tcp_port_squashed
add mountd option params and add/fix tests to make the work.
2 parents a71496c + 3bcec28 commit f8f2dec

19 files changed

+107
-31
lines changed

‎.fixtures.yml

+5
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,10 @@ fixtures:
66
concat:
77
repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
88
ref: "1.1.1"
9+
# transitive requirement of augeasproviders_shellvar
10+
augeasproviders_core:
11+
repo: "git://github.com/hercules-team/augeasproviders_core.git"
12+
augeasproviders_shellvar:
13+
repo: "git://github.com/hercules-team/augeasproviders_shellvar.git"
914
symlinks:
1015
"nfs": "#{source_dir}"

‎manifests/client/debian/install.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ensure => installed,
55
}
66

7-
Package['rpcbind'] -> Service ['rpcbind']
7+
Package['rpcbind'] -> Service['rpcbind']
88

99

1010
package { ['nfs-common', 'nfs4-acl-tools']:

‎manifests/client/redhat/service.pp

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
require => Class['nfs::client::redhat::configure']
88
}
99

10+
# lint:ignore:selector_inside_resource would not add much to readability
11+
1012
service {'nfslock':
1113
ensure => running,
1214
name => $::nfs::client::redhat::params::osmajor ? {
@@ -32,6 +34,8 @@
3234
}
3335
}
3436

37+
# lint:endignore
38+
3539
if $::nfs::client::redhat::params::osmajor == 6 or $::nfs::client::redhat::params::osmajor == 7 {
3640
service {'rpcbind':
3741
ensure => running,

‎manifests/server.pp

+6-1
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@
4040
$nfs_v4_root_export_atboot = false,
4141
$nfs_v4_root_export_options = '_netdev',
4242
$nfs_v4_root_export_bindmount = undef,
43-
$nfs_v4_root_export_tag = undef
43+
$nfs_v4_root_export_tag = undef,
44+
#
45+
$mountd_port = undef,
46+
$mountd_threads = 1
4447
) inherits nfs::params {
4548

4649
class { "nfs::server::${::nfs::params::osfamily}":
4750
nfs_v4 => $nfs_v4,
4851
nfs_v4_idmap_domain => $nfs_v4_idmap_domain,
52+
mountd_port => $mountd_port,
53+
mountd_threads => $mountd_threads,
4954
}
5055

5156
include nfs::server::configure

‎manifests/server/configure.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'nfs_exports_header':
1111
target => '/etc/exports',
1212
content => "# This file is configured through the nfs::server puppet module\n",
13-
order => 01;
13+
order => '01';
1414
}
1515

1616
if $nfs::server::nfs_v4 == true {

‎manifests/server/darwin.pp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
class nfs::server::darwin(
22
$nfs_v4 = false,
3-
$nfs_v4_idmap_domain = undef
3+
$nfs_v4_idmap_domain = undef,
4+
$mountd_port = undef,
5+
$mountd_threads = 1
46
) {
57
fail('NFS server is not supported on Darwin')
68
}

‎manifests/server/debian.pp

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Debian specifix stuff
22
class nfs::server::debian(
3-
$nfs_v4 = false,
4-
$nfs_v4_idmap_domain = undef
3+
$nfs_v4 = false,
4+
$nfs_v4_idmap_domain = undef,
5+
$mountd_port = undef,
6+
$mountd_threads = 1
57
) {
68

79
if !defined(Class['nfs::client::debian']) {
@@ -11,5 +13,15 @@
1113
}
1214
}
1315

16+
if ($mountd_port != undef){
17+
shellvar { 'rpc-mount-options':
18+
ensure => present,
19+
target => '/etc/default/nfs-kernel-server',
20+
variable => 'RPCMOUNTDOPTS',
21+
value => "--manage-gids --port ${mountd_port} --num-threads ${mountd_threads}",
22+
notify => Service['nfs-kernel-server'],
23+
}
24+
}
25+
1426
include nfs::server::debian::install, nfs::server::debian::service
1527
}

‎manifests/server/gentoo.pp

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Gentoo specifix stuff
22
class nfs::server::gentoo(
33
$nfs_v4 = false,
4-
$nfs_v4_idmap_domain = undef
4+
$nfs_v4_idmap_domain = undef,
5+
$mountd_port = undef,
6+
$mountd_threads = 1
57
) {
68

79
if !defined(Class['nfs::client::gentoo']) {
@@ -11,6 +13,10 @@
1113
}
1214
}
1315

16+
if ($mountd_port != undef){
17+
fail('setting the mountd port currently not supported on Gentoo')
18+
}
19+
1420
include nfs::server::gentoo::install, nfs::server::gentoo::service
1521

1622
}

‎manifests/server/nfs_v4/configure.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'nfs_exports_root':
55
target => '/etc/exports',
66
content => "${nfs::server::nfs_v4_export_root} ${nfs::server::nfs_v4_export_root_clients}\n",
7-
order => 02
7+
order => '02'
88
}
99
file {
1010
$nfs::server::nfs_v4_export_root:

‎manifests/server/redhat.pp

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
class nfs::server::redhat(
2-
$nfs_v4 = false,
3-
$nfs_v4_idmap_domain = undef
2+
$nfs_v4 = false,
3+
$nfs_v4_idmap_domain = undef,
4+
$mountd_port = undef,
5+
$mountd_threads = 1
46
) {
57

68
if !defined(Class['nfs::client::redhat']) {
@@ -10,6 +12,10 @@
1012
}
1113
}
1214

15+
if ($mountd_port != undef){
16+
fail('Setting mountd port currently not supported on RedHat')
17+
}
18+
1319
include nfs::server::redhat::install, nfs::server::redhat::service
1420

1521

‎metadata.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"issues_url": "https://github.com/echocat/puppet-nfs/issues",
3737
"dependencies": [
3838
{"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0"},
39-
{"name":"puppetlabs/concat","version_requirement":">= 1.1.1"}
39+
{"name":"puppetlabs/concat","version_requirement":">= 1.1.1"},
40+
{"name":"herculesteam/augeasproviders_shellvar","version_requirement":">= 2.1.0"}
4041
]
4142
}

‎spec/classes/client_redhat_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'spec_helper'
22
describe 'nfs::client::redhat' do
33
context "operatingsystemrelease => 7.0" do
4-
let(:facts) { {:operatingsystemrelease => 7.0 } }
4+
let(:facts) { {:operatingsystemrelease => '7.0' } }
55
it do
66
should contain_class('nfs::client::redhat::install')
77
should contain_class('nfs::client::redhat::configure')
@@ -19,7 +19,7 @@
1919
end
2020

2121
context "operatingsystemrelease => 6.4" do
22-
let(:facts) { {:operatingsystemrelease => 6.4 } }
22+
let(:facts) { {:operatingsystemrelease => '6.4' } }
2323
it do
2424
should contain_class('nfs::client::redhat::install')
2525
should contain_class('nfs::client::redhat::configure')
@@ -64,14 +64,14 @@
6464

6565
context ":nfs_v4 => true" do
6666
let(:params) {{ :nfs_v4 => true }}
67-
let(:facts) {{ :operatingsystemrelease => 6.4 }}
67+
let(:facts) {{ :operatingsystemrelease => '6.4' }}
6868
it do
6969
should contain_augeas('/etc/idmapd.conf')
7070
end
7171
end
7272

7373
context "operatingsystemrelease => 5.3" do
74-
let(:facts) { {:operatingsystemrelease => 5.3 } }
74+
let(:facts) { {:operatingsystemrelease => '5.3' } }
7575
it do
7676
should contain_class('nfs::client::redhat')
7777
should contain_package('portmap')

‎spec/classes/client_spec.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
it { should contain_class('nfs::client::debian') }
1111
end
1212
context "operatingsysten => scientific" do
13-
let(:facts) { {:operatingsystem => 'scientific', :operatingsystemrelease => 6.4 } }
13+
let(:facts) { {:operatingsystem => 'scientific', :operatingsystemrelease => '6.4' } }
1414
it { should contain_class('nfs::client::redhat') }
1515
end
1616
context "operatingsysten => SLC" do
17-
let(:facts) { {:operatingsystem => 'SLC', :operatingsystemrelease => 6.4 } }
17+
let(:facts) { {:operatingsystem => 'SLC', :operatingsystemrelease => '6.4' } }
1818
it { should contain_class('nfs::client::redhat') }
1919
end
2020
context "operatingsysten => centos v7" do
21-
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => 7.0 } }
21+
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => '7.0' } }
2222
it { should contain_class('nfs::client::redhat') }
2323
end
2424
context "operatingsysten => centos v6" do
25-
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => 6.4 } }
25+
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => '6.4' } }
2626
it { should contain_class('nfs::client::redhat') }
2727
end
2828
context "operatingsysten => centos v5" do
29-
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => 5.4 } }
29+
let(:facts) { {:operatingsystem => 'centos', :operatingsystemrelease => '5.4' } }
3030
it { should contain_class('nfs::client::redhat') }
3131
end
3232
context "operatingsysten => redhat v7" do
33-
let(:facts) { {:operatingsystem => 'redhat', :operatingsystemrelease => 7.0 } }
33+
let(:facts) { {:operatingsystem => 'redhat', :operatingsystemrelease => '7.0' } }
3434
it { should contain_class('nfs::client::redhat') }
3535
end
3636
context "operatingsysten => redhat v6" do
37-
let(:facts) { {:operatingsystem => 'redhat', :operatingsystemrelease => 6.4 } }
37+
let(:facts) { {:operatingsystem => 'redhat', :operatingsystemrelease => '6.4' } }
3838
it { should contain_class('nfs::client::redhat') }
3939
end
4040
context "operatingsysten => Amazon v3" do

‎spec/classes/coverage_spec.rb

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#
2+
# activate coverage calculation for the whole project
3+
#
4+
at_exit { RSpec::Puppet::Coverage.report! }

‎spec/classes/server_debian_spec.rb

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11

22
require 'spec_helper'
3-
describe 'nfs::server::debian' do
3+
describe 'nfs::server::debian', :type => :class do
44
it do
55
should contain_class('nfs::client::debian')
6+
should contain_class('nfs::server::debian::service')
67
should contain_package('nfs-kernel-server')
78
should contain_service('nfs-kernel-server').with( 'ensure' => 'running' )
89
end
@@ -13,5 +14,12 @@
1314
end
1415

1516
end
17+
context "mountd params set" do
18+
let(:params) {{ :mountd_port => '4711' }}
19+
it do
20+
should contain_shellvar('rpc-mount-options') #.with( 'ensure' => 'present' )
21+
end
22+
23+
end
1624
end
1725

‎spec/classes/server_gentoo_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
it do
55
should contain_class('nfs::client::gentoo')
6+
should contain_class('nfs::server::gentoo::service')
67
should contain_service('nfs').with( 'ensure' => 'running' )
78
end
89
context ":nfs_v4 => true" do

‎spec/classes/server_redhat_spec.rb

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
require 'spec_helper'
22
describe 'nfs::server::redhat' do
33
context "operatingsystemrelease => 6.4" do
4-
let(:facts) { {:operatingsystemrelease => 6.4} }
4+
let(:facts) { {:operatingsystemrelease => '6.4'} }
55
it do
66
should contain_class('nfs::client::redhat')
77
should contain_service('nfs').with( 'ensure' => 'running' )
88
end
99
end
1010

1111
context "operatingsystemrelease => 7.1" do
12-
let(:facts) { {:operatingsystemrelease => 7.1} }
12+
let(:facts) { {:operatingsystemrelease => '7.1'} }
1313
it do
1414
should contain_class('nfs::client::redhat')
15+
should contain_class('nfs::server::redhat::service')
1516
should contain_service('nfs-server').with( 'ensure' => 'running' )
1617
end
17-
18+
1819
context ":nfs_v4 => true" do
1920
let(:params) {{ :nfs_v4 => true , :nfs_v4_idmap_domain => 'teststring' }}
2021
it do
2122
should contain_augeas('/etc/idmapd.conf').with_changes(/set Domain teststring/)
2223
end
2324
end
25+
26+
context "setting mountd port" do
27+
let(:params) {{ :mountd_port => 4711 }}
28+
it do
29+
expect {
30+
should contain_class('nfs::server::redhat')
31+
}.to raise_error(Puppet::Error, /Setting mountd port currently not supported on RedHat/)
32+
end
33+
end
2434
end
2535
end

‎spec/classes/server_spec.rb

+16-4
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,36 @@
1717
let(:facts) { {:operatingsystem => 'ubuntu', :concat_basedir => '/tmp', } }
1818
it { should contain_class('nfs::server::debian') }
1919
end
20+
21+
context "operatingsysten => ubuntu with params for mountd" do
22+
let(:facts) { {:operatingsystem => 'ubuntu', :concat_basedir => '/tmp', } }
23+
let(:params) {{ :mountd_port => '4711', :mountd_threads => '99' }}
24+
25+
it do
26+
should contain_class('nfs::server::debian').with( 'mountd_port' => '4711', 'mountd_threads' => '99' )
27+
end
28+
end
29+
2030
context "operatingsysten => debian" do
2131
let(:facts) { {:operatingsystem => 'debian', :concat_basedir => '/tmp',} }
2232
it { should contain_class('nfs::server::debian') }
2333
end
34+
2435
context "operatingsysten => scientific" do
25-
let(:facts) { {:operatingsystem => 'scientific', :concat_basedir => '/tmp', :operatingsystemrelease => 6.4 } }
36+
let(:facts) { {:operatingsystem => 'scientific', :concat_basedir => '/tmp', :operatingsystemrelease => '6.4' } }
2637
it { should contain_class('nfs::server::redhat') }
2738
end
2839
context "operatingsysten => SLC" do
29-
let(:facts) { {:operatingsystem => 'SLC', :concat_basedir => '/tmp', :operatingsystemrelease => 6.4 } }
40+
let(:facts) { {:operatingsystem => 'SLC', :concat_basedir => '/tmp', :operatingsystemrelease => '6.4' } }
3041
it { should contain_class('nfs::server::redhat') }
3142
end
43+
3244
context "operatingsysten => centos v6" do
33-
let(:facts) { {:operatingsystem => 'centos', :concat_basedir => '/tmp', :operatingsystemrelease => 6.4 } }
45+
let(:facts) { {:operatingsystem => 'centos', :concat_basedir => '/tmp', :operatingsystemrelease => '6.4' } }
3446
it { should contain_class('nfs::server::redhat') }
3547
end
3648
context "operatingsysten => redhat v6" do
37-
let(:facts) { {:operatingsystem => 'redhat', :concat_basedir => '/tmp', :operatingsystemrelease => 6.4 } }
49+
let(:facts) { {:operatingsystem => 'redhat', :concat_basedir => '/tmp', :operatingsystemrelease => '6.4' } }
3850
it { should contain_class('nfs::server::redhat') }
3951
end
4052
context "operatingsysten => Amazon v3" do

‎spec/defines/client_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
it do
2424
should compile
2525
should contain_class('nfs::client')
26-
should contain_mount('shared nfs.int.net:/srv/share by test.example.com /srv/test')
26+
# should contain_mount('shared nfs.int.net:/srv/share by test.example.com /srv/test')
2727
#should contain_mount('/srv/test')
2828
end
2929
end

0 commit comments

Comments
 (0)