parameter datatypes

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index 5421683890acc0023b91070032bd7236c2f3e833..cc96ece0513d69709b87af611173e2a6e4532f62 100644 (file)
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,2 +1 @@
 --relative
---no-parameter_types-check

diff --git a/.sync.yml b/.sync.yml
index 88cce1e4349f05d2bb94eb9a7edea6a555515a91..93ccd8bd744ee0e3fd0d1aa0423ff13065903a95 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -32,6 +32,3 @@ spec/spec_helper.rb:
 .travis.yml:
   delete: true
 changelog_since_tag: 'v3.0.0'
-Rakefile:
-  extra_disabled_lint_checks:
-    - parameter_types

diff --git a/Rakefile b/Rakefile
index bc50d6fd6a38bc56b868a0a7a64b2004b509cfc4..1a8c463f8e6c2310098e54ac22781d1b7119b635 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -42,7 +42,6 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
-PuppetLint.configuration.send('disable_parameter_types')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?

diff --git a/manifests/init.pp b/manifests/init.pp
index b933d786b0abca4f2449da190b234706da8c035e..d8480109a7d36b67757087f4c5dd4e1e440fa4f6 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,13 +31,13 @@
 #   Controls whether puppet manages the ebtables package or not. If managed, the package will use the value of pkg_ensure.
 #
 class firewall (
-  $ensure          = running,
-  $ensure_v6       = undef,
-  $pkg_ensure      = present,
-  $service_name    = $firewall::params::service_name,
-  $service_name_v6 = $firewall::params::service_name_v6,
-  $package_name    = $firewall::params::package_name,
-  $ebtables_manage = false,
+  Enum[running, stopped, 'running', 'stopped']           $ensure          = running,
+  Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6       = undef,
+  Enum[present, latest, 'present', 'latest']             $pkg_ensure      = present,
+  Variant[String[1], Array[String[1]]]                   $service_name    = $firewall::params::service_name,
+  Optional[String[1]]                                    $service_name_v6 = $firewall::params::service_name_v6,
+  Optional[Variant[String[1], Array[String[1]]]]         $package_name    = $firewall::params::package_name,
+  Boolean                                                $ebtables_manage = false,
 ) inherits firewall::params {
   $_ensure_v6 = pick($ensure_v6, $ensure)
 

diff --git a/manifests/linux.pp b/manifests/linux.pp
index f800847dd1aaf1fba44a5dabe64887b71aa7b990..5c15c8efcf0fe6b9cbe9fc75033dbe7a25079235 100644 (file)
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -24,14 +24,14 @@
 # @api private
 #
 class firewall::linux (
-  $ensure          = running,
-  $ensure_v6       = undef,
-  $pkg_ensure      = installed,
-  $service_name    = $firewall::params::service_name,
-  $service_name_v6 = $firewall::params::service_name_v6,
-  $package_name    = $firewall::params::package_name,
-  $ebtables_manage = false,
-  $iptables_name   = $firewall::params::iptables_name,
+  Enum[running, stopped, 'running', 'stopped']           $ensure          = running,
+  Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6       = undef,
+  Enum[installed, latest, 'installed', 'latest']         $pkg_ensure      = installed,
+  Variant[String[1], Array[String[1]]]                   $service_name    = $firewall::params::service_name,
+  Optional[String[1]]                                    $service_name_v6 = $firewall::params::service_name_v6,
+  Optional[Variant[String[1], Array[String[1]]]]         $package_name    = $firewall::params::package_name,
+  Boolean                                                $ebtables_manage = false,
+  String[1]                                              $iptables_name   = $firewall::params::iptables_name,
 ) inherits firewall::params {
   $enable = $ensure ? {
     'running' => true,

diff --git a/manifests/linux/archlinux.pp b/manifests/linux/archlinux.pp
index d04fe1fca0e430ab9fb6d852adea9dca9d0e0dc3..da82363d5f876eeb7a09e389ddba2f60f1bd8b9d 100644 (file)
--- a/manifests/linux/archlinux.pp
+++ b/manifests/linux/archlinux.pp
@@ -19,11 +19,11 @@
 # @api private
 #
 class firewall::linux::archlinux (
-  $ensure         = 'running',
-  $enable         = true,
-  $service_name   = $firewall::params::service_name,
-  $package_name   = $firewall::params::package_name,
-  $package_ensure = $firewall::params::package_ensure,
+  Enum[running, stopped, 'running', 'stopped']   $ensure         = 'running',
+  Boolean                                        $enable         = true,
+  Variant[String[1], Array[String[1]]]           $service_name   = $firewall::params::service_name,
+  Optional[Variant[String[1], Array[String[1]]]] $package_name   = $firewall::params::package_name,
+  Enum[present, latest, 'present', 'latest']     $package_ensure = $firewall::params::package_ensure,
 ) inherits firewall::params {
   if $package_name {
     package { $package_name:

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index 4498241b5dd779a767849526e59224e62fe3887c..47ab8590f1f6f10ecacdb3eee3ab3d72f996241e 100644 (file)
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -19,11 +19,11 @@
 # @api private
 #
 class firewall::linux::debian (
-  $ensure         = running,
-  $enable         = true,
-  $service_name   = $firewall::params::service_name,
-  $package_name   = $firewall::params::package_name,
-  $package_ensure = $firewall::params::package_ensure,
+  Enum[running, stopped, 'running', 'stopped']   $ensure         = running,
+  Boolean                                        $enable         = true,
+  Variant[String[1], Array[String[1]]]           $service_name   = $firewall::params::service_name,
+  Optional[Variant[String[1], Array[String[1]]]] $package_name   = $firewall::params::package_name,
+  Enum[present, latest, 'present', 'latest']     $package_ensure = $firewall::params::package_ensure,
 ) inherits firewall::params {
   if $package_name {
     ensure_packages([$package_name], {

diff --git a/manifests/linux/gentoo.pp b/manifests/linux/gentoo.pp
index 22a439e44478bc5a55a46b659885109154e44956..0f845784cc6b6c0f47353ebc82f7e5db7ff689d2 100644 (file)
--- a/manifests/linux/gentoo.pp
+++ b/manifests/linux/gentoo.pp
@@ -19,11 +19,11 @@
 # @api private
 #
 class firewall::linux::gentoo (
-  $ensure         = 'running',
-  $enable         = true,
-  $service_name   = $firewall::params::service_name,
-  $package_name   = $firewall::params::package_name,
-  $package_ensure = $firewall::params::package_ensure,
+  Enum[running, stopped, 'running', 'stopped']   $ensure         = running,
+  Boolean                                        $enable         = true,
+  Variant[String[1], Array[String[1]]]           $service_name   = $firewall::params::service_name,
+  Optional[Variant[String[1], Array[String[1]]]] $package_name   = $firewall::params::package_name,
+  Enum[present, latest, 'present', 'latest']     $package_ensure = $firewall::params::package_ensure,
 ) inherits firewall::params {
   if $package_name {
     package { $package_name:

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index 4fccd57e6aa5c34186e2189fe8189fb539268dda..9965043223469600762b2201fd757835aae05931 100644 (file)
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -32,16 +32,16 @@
 # @api private
 #
 class firewall::linux::redhat (
-  $ensure           = running,
-  $ensure_v6        = undef,
-  $enable           = true,
-  $enable_v6        = undef,
-  $service_name     = $firewall::params::service_name,
-  $service_name_v6  = $firewall::params::service_name_v6,
-  $package_name     = $firewall::params::package_name,
-  $package_ensure   = $firewall::params::package_ensure,
-  $sysconfig_manage = $firewall::params::sysconfig_manage,
-  $firewalld_manage = $firewall::params::firewalld_manage,
+  Enum[running, stopped, 'running', 'stopped']           $ensure           = running,
+  Optional[Enum[running, stopped, 'running', 'stopped']] $ensure_v6        = undef,
+  Boolean                                                $enable           = true,
+  Optional[Boolean]                                      $enable_v6        = undef,
+  Variant[String[1], Array[String[1]]]                   $service_name     = $firewall::params::service_name,
+  Optional[String[1]]                                    $service_name_v6  = $firewall::params::service_name_v6,
+  Optional[Variant[String[1], Array[String[1]]]]         $package_name     = $firewall::params::package_name,
+  Enum[present, latest, 'present', 'latest']             $package_ensure   = $firewall::params::package_ensure,
+  Boolean                                                $sysconfig_manage = $firewall::params::sysconfig_manage,
+  Boolean                                                $firewalld_manage = $firewall::params::firewalld_manage,
 ) inherits firewall::params {
   $_ensure_v6 = pick($ensure_v6, $ensure)
   $_enable_v6 = pick($enable_v6, $enable)