Skip to content

Commit 052d95b

Browse files
committed
parameter datatypes
1 parent d95480d commit 052d95b

File tree

9 files changed

+40
-45
lines changed

9 files changed

+40
-45
lines changed

.puppet-lint.rc

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
--relative
2-
--no-parameter_types-check

.sync.yml

-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ spec/spec_helper.rb:
3232
.travis.yml:
3333
delete: true
3434
changelog_since_tag: 'v3.0.0'
35-
Rakefile:
36-
extra_disabled_lint_checks:
37-
- parameter_types

Rakefile

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45-
PuppetLint.configuration.send('disable_parameter_types')
4645

4746

4847
if Bundler.rubygems.find_name('github_changelog_generator').any?

manifests/init.pp

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
# Controls whether puppet manages the ebtables package or not. If managed, the package will use the value of pkg_ensure.
3232
#
3333
class firewall (
34-
$ensure = running,
35-
$ensure_v6 = undef,
36-
$pkg_ensure = present,
37-
$service_name = $firewall::params::service_name,
38-
$service_name_v6 = $firewall::params::service_name_v6,
39-
$package_name = $firewall::params::package_name,
40-
$ebtables_manage = false,
34+
Enum[running, stopped, 'running', 'stopped'] $ensure = running,
35+
Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef,
36+
Enum[present, latest, 'present', 'latest'] $pkg_ensure = present,
37+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
38+
Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6,
39+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
40+
Boolean $ebtables_manage = false,
4141
) inherits firewall::params {
4242
$_ensure_v6 = pick($ensure_v6, $ensure)
4343

manifests/linux.pp

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
# @api private
2525
#
2626
class firewall::linux (
27-
$ensure = running,
28-
$ensure_v6 = undef,
29-
$pkg_ensure = installed,
30-
$service_name = $firewall::params::service_name,
31-
$service_name_v6 = $firewall::params::service_name_v6,
32-
$package_name = $firewall::params::package_name,
33-
$ebtables_manage = false,
34-
$iptables_name = $firewall::params::iptables_name,
27+
Enum[running, stopped, 'running', 'stopped'] $ensure = running,
28+
Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef,
29+
Enum[installed, latest, 'installed', 'latest'] $pkg_ensure = installed,
30+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
31+
Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6,
32+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
33+
Boolean $ebtables_manage = false,
34+
String[1] $iptables_name = $firewall::params::iptables_name,
3535
) inherits firewall::params {
3636
$enable = $ensure ? {
3737
'running' => true,

manifests/linux/archlinux.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
# @api private
2020
#
2121
class firewall::linux::archlinux (
22-
$ensure = 'running',
23-
$enable = true,
24-
$service_name = $firewall::params::service_name,
25-
$package_name = $firewall::params::package_name,
26-
$package_ensure = $firewall::params::package_ensure,
22+
Enum[running, stopped, 'running', 'stopped'] $ensure = 'running',
23+
Boolean $enable = true,
24+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
25+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
26+
Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure,
2727
) inherits firewall::params {
2828
if $package_name {
2929
package { $package_name:

manifests/linux/debian.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
# @api private
2020
#
2121
class firewall::linux::debian (
22-
$ensure = running,
23-
$enable = true,
24-
$service_name = $firewall::params::service_name,
25-
$package_name = $firewall::params::package_name,
26-
$package_ensure = $firewall::params::package_ensure,
22+
Enum[running, stopped, 'running', 'stopped'] $ensure = running,
23+
Boolean $enable = true,
24+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
25+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
26+
Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure,
2727
) inherits firewall::params {
2828
if $package_name {
2929
ensure_packages([$package_name], {

manifests/linux/gentoo.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
# @api private
2020
#
2121
class firewall::linux::gentoo (
22-
$ensure = 'running',
23-
$enable = true,
24-
$service_name = $firewall::params::service_name,
25-
$package_name = $firewall::params::package_name,
26-
$package_ensure = $firewall::params::package_ensure,
22+
Enum[running, stopped, 'running', 'stopped'] $ensure = running,
23+
Boolean $enable = true,
24+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
25+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
26+
Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure,
2727
) inherits firewall::params {
2828
if $package_name {
2929
package { $package_name:

manifests/linux/redhat.pp

+10-10
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
# @api private
3333
#
3434
class firewall::linux::redhat (
35-
$ensure = running,
36-
$ensure_v6 = undef,
37-
$enable = true,
38-
$enable_v6 = undef,
39-
$service_name = $firewall::params::service_name,
40-
$service_name_v6 = $firewall::params::service_name_v6,
41-
$package_name = $firewall::params::package_name,
42-
$package_ensure = $firewall::params::package_ensure,
43-
$sysconfig_manage = $firewall::params::sysconfig_manage,
44-
$firewalld_manage = $firewall::params::firewalld_manage,
35+
Enum[running, stopped, 'running', 'stopped'] $ensure = running,
36+
Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6 = undef,
37+
Boolean $enable = true,
38+
Optional[Boolean] $enable_v6 = undef,
39+
Variant[String[1], Array[String[1]]] $service_name = $firewall::params::service_name,
40+
Optional[String[1]] $service_name_v6 = $firewall::params::service_name_v6,
41+
Optional[Variant[String[1], Array[String[1]]]] $package_name = $firewall::params::package_name,
42+
Enum[present, latest, 'present', 'latest'] $package_ensure = $firewall::params::package_ensure,
43+
Boolean $sysconfig_manage = $firewall::params::sysconfig_manage,
44+
Boolean $firewalld_manage = $firewall::params::firewalld_manage,
4545
) inherits firewall::params {
4646
$_ensure_v6 = pick($ensure_v6, $ensure)
4747
$_enable_v6 = pick($enable_v6, $enable)

0 commit comments

Comments
 (0)