relative classname inclusion

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index ec11b39f09f62ece926ee4e2588598cd7f07fba9..53ec580531a7b2ef8cc94508beca0496aefb7cef 100644 (file)
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,4 +1,3 @@
 --relative
---no-relative_classname_inclusion-check
 --no-parameter_types-check
 --no-top_scope_facts-check

diff --git a/.sync.yml b/.sync.yml
index 9b3aaea89674b30ae34edfd34dfe5e37f3699fe6..68cc2f4319f14e31939b083b25027c5e982e7cf5 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -34,6 +34,5 @@ spec/spec_helper.rb:
 changelog_since_tag: 'v3.0.0'
 Rakefile:
   extra_disabled_lint_checks:
-    - relative_classname_inclusion
     - parameter_types
     - top_scope_facts

diff --git a/Rakefile b/Rakefile
index 36b90afb3ca7464929750aad9d83066f1058d758..d9014db159c8bf43f6e51ee1a9aa9c5f93e7090b 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -42,7 +42,6 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
-PuppetLint.configuration.send('disable_relative_classname_inclusion')
 PuppetLint.configuration.send('disable_parameter_types')
 PuppetLint.configuration.send('disable_top_scope_facts')
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 02c110935dc67999afcf7f9ecb5cd556f0dec435..577e22b94e8f0de19a7b7a1e5375ea87b29e1d09 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,7 +38,7 @@ class firewall (
   $service_name_v6 = $firewall::params::service_name_v6,
   $package_name    = $firewall::params::package_name,
   $ebtables_manage = false,
-) inherits ::firewall::params {
+) inherits firewall::params {
   $_ensure_v6 = pick($ensure_v6, $ensure)
 
   case $ensure {

diff --git a/manifests/linux.pp b/manifests/linux.pp
index 2e1416c5da0b1e96dcb2233fab82ae51514dc494..f800847dd1aaf1fba44a5dabe64887b71aa7b990 100644 (file)
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -32,7 +32,7 @@ class firewall::linux (
   $package_name    = $firewall::params::package_name,
   $ebtables_manage = false,
   $iptables_name   = $firewall::params::iptables_name,
-) inherits ::firewall::params {
+) inherits firewall::params {
   $enable = $ensure ? {
     'running' => true,
     'stopped' => false,

diff --git a/manifests/linux/archlinux.pp b/manifests/linux/archlinux.pp
index d415caf200784ae9cfd9a313a19c0fa2f0bb7355..d04fe1fca0e430ab9fb6d852adea9dca9d0e0dc3 100644 (file)
--- a/manifests/linux/archlinux.pp
+++ b/manifests/linux/archlinux.pp
@@ -24,7 +24,7 @@ class firewall::linux::archlinux (
   $service_name   = $firewall::params::service_name,
   $package_name   = $firewall::params::package_name,
   $package_ensure = $firewall::params::package_ensure,
-) inherits ::firewall::params {
+) inherits firewall::params {
   if $package_name {
     package { $package_name:
       ensure => $package_ensure,

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index b8d6cdec7ba9af2c438aafe054d99be888a6d513..4498241b5dd779a767849526e59224e62fe3887c 100644 (file)
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -24,7 +24,7 @@ class firewall::linux::debian (
   $service_name   = $firewall::params::service_name,
   $package_name   = $firewall::params::package_name,
   $package_ensure = $firewall::params::package_ensure,
-) inherits ::firewall::params {
+) inherits firewall::params {
   if $package_name {
     ensure_packages([$package_name], {
         ensure  => $package_ensure

diff --git a/manifests/linux/gentoo.pp b/manifests/linux/gentoo.pp
index 0235a6ab52b8715aa610e0db686eec6ad6219824..22a439e44478bc5a55a46b659885109154e44956 100644 (file)
--- a/manifests/linux/gentoo.pp
+++ b/manifests/linux/gentoo.pp
@@ -24,7 +24,7 @@ class firewall::linux::gentoo (
   $service_name   = $firewall::params::service_name,
   $package_name   = $firewall::params::package_name,
   $package_ensure = $firewall::params::package_ensure,
-) inherits ::firewall::params {
+) inherits firewall::params {
   if $package_name {
     package { $package_name:
       ensure => $package_ensure,

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index fa1fdc807468454bfb49322816376e9f34bf4702..4fccd57e6aa5c34186e2189fe8189fb539268dda 100644 (file)
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -42,7 +42,7 @@ class firewall::linux::redhat (
   $package_ensure   = $firewall::params::package_ensure,
   $sysconfig_manage = $firewall::params::sysconfig_manage,
   $firewalld_manage = $firewall::params::firewalld_manage,
-) inherits ::firewall::params {
+) inherits firewall::params {
   $_ensure_v6 = pick($ensure_v6, $ensure)
   $_enable_v6 = pick($enable_v6, $enable)