From e3e76a64019457ba224c468d4fcbb40d74f56080 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Tue, 14 Feb 2023 11:09:45 +0000 Subject: [PATCH] relative classname inclusion --- .puppet-lint.rc | 1 - .sync.yml | 1 - Rakefile | 1 - manifests/init.pp | 2 +- manifests/linux.pp | 2 +- manifests/linux/archlinux.pp | 2 +- manifests/linux/debian.pp | 2 +- manifests/linux/gentoo.pp | 2 +- manifests/linux/redhat.pp | 2 +- 9 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index ec11b39..53ec580 100644 --- 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 9b3aaea..68cc2f4 100644 --- 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 36b90af..d9014db 100644 --- 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 02c1109..577e22b 100644 --- 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 2e1416c..f800847 100644 --- 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 d415caf..d04fe1f 100644 --- 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 b8d6cde..4498241 100644 --- 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 0235a6a..22a439e 100644 --- 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 fa1fdc8..4fccd57 100644 --- 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) -- 2.45.2