Skip to content

Commit 983fae2

Browse files
derdannederdanne
authored
Merge pull request #49 from bastelfreak/puppet4
Migrate to Puppet 4
2 parents 3075569 + a8e2e26 commit 983fae2

File tree

10 files changed

+725
-323
lines changed

10 files changed

+725
-323
lines changed

‎.rubocop.yml

Lines changed: 491 additions & 36 deletions
Large diffs are not rendered by default.

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ script:
99
matrix:
1010
fast_finish: true
1111
include:
12-
- rvm: 2.1
13-
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
1412
- rvm: 2.1
1513
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
1614
- rvm: 2.2

‎Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ group :test do
3131
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
3232
gem 'puppet-lint-unquoted_string-check', :require => false
3333
gem 'puppet-lint-variable_contains_upcase', :require => false
34+
gem 'rubocop-rspec', :require => false
35+
gem 'rspec-puppet-facts', :require => false
3436
end
3537

3638
group :development do

‎manifests/init.pp

Lines changed: 45 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
# by the nfs server.
4141
#
4242
# [*idmapd_file*]
43-
# String. It defines the location of th file with the idmapd settings.
43+
# String. It defines the location of the file with the idmapd settings.
4444
#
4545
# [*defaults_file*]
46-
# String. It defines the location of th file with the nfs settings.
46+
# String. It defines the location of the file with the nfs settings.
4747
#
4848
# [*manage_packages*]
4949
# Boolean. It defines if the packages should be managed through this module
@@ -162,114 +162,51 @@
162162
#
163163

164164
class nfs(
165-
$ensure = 'present',
166-
$server_enabled = false,
167-
$client_enabled = false,
168-
$nfs_v4 = $::nfs::params::nfs_v4,
169-
$nfs_v4_client = $::nfs::params::nfs_v4,
170-
$exports_file = $::nfs::params::exports_file,
171-
$idmapd_file = $::nfs::params::idmapd_file,
172-
$defaults_file = $::nfs::params::defaults_file,
173-
$manage_packages = true,
174-
$server_packages = $::nfs::params::server_packages,
175-
$server_package_ensure = 'installed',
176-
$client_packages = $::nfs::params::client_packages,
177-
$client_package_ensure = 'installed',
178-
$manage_server_service = true,
179-
$manage_server_servicehelper = true,
180-
$manage_client_service = true,
181-
$server_service_name = $::nfs::params::server_service_name,
182-
$server_service_ensure = 'running',
183-
$server_service_enable = true,
184-
$server_service_hasrestart = $::nfs::params::server_service_hasrestart,
185-
$server_service_hasstatus = $::nfs::params::server_service_hasstatus,
186-
$server_service_restart_cmd = $::nfs::params::server_service_restart_cmd,
187-
$server_nfsv4_servicehelper = $::nfs::params::server_nfsv4_servicehelper,
188-
$client_services = $::nfs::params::client_services,
189-
$client_nfsv4_services = $::nfs::params::client_nfsv4_services,
190-
$client_services_hasrestart = $::nfs::params::client_services_hasrestart,
191-
$client_services_hasstatus = $::nfs::params::client_services_hasstatus,
192-
$client_idmapd_setting = $::nfs::params::client_idmapd_setting,
193-
$client_nfs_fstype = $::nfs::params::client_nfs_fstype,
194-
$client_nfs_options = $::nfs::params::client_nfs_options,
195-
$client_nfsv4_fstype = $::nfs::params::client_nfsv4_fstype,
196-
$client_nfsv4_options = $::nfs::params::client_nfsv4_options,
197-
$nfs_v4_export_root = $::nfs::params::nfs_v4_export_root,
198-
$nfs_v4_export_root_clients = $::nfs::params::nfs_v4_export_root_clients,
199-
$nfs_v4_mount_root = $::nfs::params::nfs_v4_mount_root,
200-
$nfs_v4_idmap_domain = $::nfs::params::nfs_v4_idmap_domain,
201-
$nfs_v4_root_export_ensure = 'mounted',
202-
$nfs_v4_root_export_mount = undef,
203-
$nfs_v4_root_export_remounts = false,
204-
$nfs_v4_root_export_atboot = false,
205-
$nfs_v4_root_export_options = '_netdev',
206-
$nfs_v4_root_export_bindmount = undef,
207-
$nfs_v4_root_export_tag = undef,
165+
Enum['present', 'absent', 'running', 'stopped', 'disabled'] $ensure = 'present',
166+
Boolean $server_enabled = false,
167+
Boolean $client_enabled = false,
168+
Boolean $nfs_v4 = $::nfs::params::nfs_v4,
169+
Boolean $nfs_v4_client = $::nfs::params::nfs_v4,
170+
String $exports_file = $::nfs::params::exports_file,
171+
String $idmapd_file = $::nfs::params::idmapd_file,
172+
Optional[String] $defaults_file = $::nfs::params::defaults_file,
173+
Boolean $manage_packages = true,
174+
Array $server_packages = $::nfs::params::server_packages,
175+
String $server_package_ensure = 'installed',
176+
Array $client_packages = $::nfs::params::client_packages,
177+
String $client_package_ensure = 'installed',
178+
Boolean $manage_server_service = true,
179+
Boolean $manage_server_servicehelper = true,
180+
Boolean $manage_client_service = true,
181+
String $server_service_name = $::nfs::params::server_service_name,
182+
Enum['present', 'absent', 'running', 'stopped', 'disabled'] $server_service_ensure = 'running',
183+
Boolean $server_service_enable = true,
184+
Boolean $server_service_hasrestart = $::nfs::params::server_service_hasrestart,
185+
Boolean $server_service_hasstatus = $::nfs::params::server_service_hasstatus,
186+
Optional[String] $server_service_restart_cmd = $::nfs::params::server_service_restart_cmd,
187+
Optional[String] $server_nfsv4_servicehelper = $::nfs::params::server_nfsv4_servicehelper,
188+
$client_services = $::nfs::params::client_services,
189+
$client_nfsv4_services = $::nfs::params::client_nfsv4_services,
190+
Boolean $client_services_hasrestart = $::nfs::params::client_services_hasrestart,
191+
Boolean $client_services_hasstatus = $::nfs::params::client_services_hasstatus,
192+
Array[String] $client_idmapd_setting = $::nfs::params::client_idmapd_setting,
193+
String $client_nfs_fstype = $::nfs::params::client_nfs_fstype,
194+
String $client_nfs_options = $::nfs::params::client_nfs_options,
195+
String $client_nfsv4_fstype = $::nfs::params::client_nfsv4_fstype,
196+
String $client_nfsv4_options = $::nfs::params::client_nfsv4_options,
197+
String $nfs_v4_export_root = $::nfs::params::nfs_v4_export_root,
198+
String $nfs_v4_export_root_clients = $::nfs::params::nfs_v4_export_root_clients,
199+
String $nfs_v4_mount_root = $::nfs::params::nfs_v4_mount_root,
200+
String $nfs_v4_idmap_domain = $::nfs::params::nfs_v4_idmap_domain,
201+
String $nfs_v4_root_export_ensure = 'mounted',
202+
Optional[String] $nfs_v4_root_export_mount = undef,
203+
Boolean $nfs_v4_root_export_remounts = false,
204+
Boolean $nfs_v4_root_export_atboot = false,
205+
String $nfs_v4_root_export_options = '_netdev',
206+
Optional[String] $nfs_v4_root_export_bindmount = undef,
207+
Optional[String] $nfs_v4_root_export_tag = undef,
208208
) inherits nfs::params {
209209

210-
# validate all params
211-
212-
if ! ($ensure in [ 'present', 'absent', 'running', 'stopped', 'disabled' ]) {
213-
fail("\"${$ensure}\" is not a valid ensure parameter value")
214-
}
215-
216-
validate_bool($server_enabled)
217-
validate_bool($client_enabled)
218-
validate_bool($nfs_v4)
219-
validate_bool($nfs_v4_client)
220-
validate_string($exports_file)
221-
validate_string($idmapd_file)
222-
validate_string($defaults_file)
223-
validate_bool($manage_packages)
224-
validate_array($server_packages)
225-
validate_string($server_package_ensure)
226-
validate_array($client_packages)
227-
validate_string($client_package_ensure)
228-
validate_bool($manage_server_service)
229-
validate_bool($manage_server_servicehelper)
230-
validate_bool($manage_client_service)
231-
validate_string($server_service_name)
232-
233-
if ! ($server_service_ensure in [ 'present', 'absent', 'running', 'stopped', 'disabled' ]) {
234-
fail("\"${server_service_ensure}\" is not a valid ensure parameter value")
235-
}
236-
237-
validate_bool($server_service_enable)
238-
validate_bool($server_service_hasrestart)
239-
validate_bool($server_service_hasstatus)
240-
validate_string($server_service_restart_cmd)
241-
validate_string($server_nfsv4_servicehelper)
242-
validate_hash($client_services)
243-
validate_hash($client_nfsv4_services)
244-
validate_bool($client_services_hasrestart)
245-
validate_bool($client_services_hasstatus)
246-
validate_array($client_idmapd_setting)
247-
validate_string($client_nfs_fstype)
248-
validate_string($client_nfs_options)
249-
validate_string($client_nfsv4_fstype)
250-
validate_string($client_nfsv4_options)
251-
validate_string($nfs_v4_export_root)
252-
validate_string($nfs_v4_export_root_clients)
253-
validate_string($nfs_v4_mount_root)
254-
validate_string($nfs_v4_idmap_domain)
255-
validate_string($nfs_v4_root_export_ensure)
256-
257-
if $nfs_v4_root_export_mount != undef {
258-
validate_string($nfs_v4_root_export_mount)
259-
}
260-
261-
validate_bool($nfs_v4_root_export_remounts)
262-
validate_bool($nfs_v4_root_export_atboot)
263-
validate_string($nfs_v4_root_export_options)
264-
265-
if $nfs_v4_root_export_bindmount != undef {
266-
validate_string($nfs_v4_root_export_bindmount)
267-
}
268-
269-
if $nfs_v4_root_export_tag != undef {
270-
validate_string($nfs_v4_root_export_tag)
271-
}
272-
273210
if $server_enabled {
274211

275212
if $server_nfsv4_servicehelper != undef {

‎metadata.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,9 @@
6868
}
6969
],
7070
"requirements": [
71-
{
72-
"name": "pe",
73-
"version_requirement": ">= 3.2.0 < 5.0.0"
74-
},
7571
{
7672
"name": "puppet",
77-
"version_requirement": ">= 3.0.0 < 5.0.0"
73+
"version_requirement": ">= 4.6.1 < 5.0.0"
7874
}
7975
]
8076
}

‎spec/acceptance/class_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
describe 'include nfs without params' do
1919
context 'default parameters' do
2020
let(:pp) { "class { 'nfs': }" }
21-
it 'should apply without errors without params' do
21+
it 'applies without errors without params' do
2222
apply_manifest('include nfs', catch_failures: true)
2323
end
2424
end
@@ -48,11 +48,11 @@ class { '::nfs':
4848
}
4949
EOS
5050

51-
it 'should work with no errors based on the example' do
52-
expect(apply_manifest(server_pp).exit_code).to_not eq(1)
51+
it 'works with no errors based on the example' do
52+
expect(apply_manifest(server_pp).exit_code).not_to eq(1)
5353
end
5454

55-
it 'should run a second time without changes' do
55+
it 'runs a second time without changes' do
5656
expect(apply_manifest(server_pp).exit_code).to eq(0)
5757
end
5858

0 commit comments

Comments
 (0)