Merge pull request #66 from bastelfreak/linter

purge legacy puppet-lint checks
voxpupuli · Feb 28, 2018 · e9a6b2f · e9a6b2f
2 parents 20a465b + c1746d2
commit e9a6b2f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,6 @@ group :development, :unit_tests do
   gem 'puppet-lint-unquoted_string-check',                 :require => false
   gem 'puppet-lint-empty_string-check',                    :require => false
   gem 'puppet-lint-spaceship_operator_without_tag-check',  :require => false
-  gem 'puppet-lint-absolute_classname-check',              :require => false
   gem 'puppet-lint-undef_in_function-check',               :require => false
   gem 'puppet-lint-leading_zero-check',                    :require => false
   gem 'puppet-lint-trailing_comma-check',                  :require => false

diff --git a/manifests/dropin_file.pp b/manifests/dropin_file.pp
@@ -36,7 +36,7 @@
   Optional[String]                  $source   = undef,
   Optional[Stdlib::Absolutepath]    $target   = undef,
 ) {
-  include ::systemd
+  include systemd
 
   if $target {
     $_ensure = 'link'

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -44,19 +44,19 @@
   Optional[Variant[Array,String]] $fallback_ntp_server = undef,
 ){
 
-  contain ::systemd::systemctl::daemon_reload
+  contain systemd::systemctl::daemon_reload
 
   create_resources('systemd::service_limits', $service_limits)
 
   if $manage_resolved and $facts['systemd_internal_services'] and $facts['systemd_internal_services']['systemd-resolved.service'] {
-    contain ::systemd::resolved
+    contain systemd::resolved
   }
 
   if $manage_networkd and $facts['systemd_internal_services'] and $facts['systemd_internal_services']['systemd-networkd.service'] {
-    contain ::systemd::networkd
+    contain systemd::networkd
   }
 
   if $manage_timesyncd and $facts['systemd_internal_services'] and $facts['systemd_internal_services']['systemd-timesyncd.service'] {
-    contain ::systemd::timesyncd
+    contain systemd::timesyncd
   }
 }
diff --git a/manifests/network.pp b/manifests/network.pp
@@ -9,7 +9,7 @@
   Boolean $restart_service               = true,
 ){
 
-  include ::systemd
+  include systemd
 
   if $restart_service and $systemd::manage_networkd {
     $notify = Service['systemd-networkd']

diff --git a/manifests/service_limits.pp b/manifests/service_limits.pp
@@ -34,7 +34,7 @@
   Boolean                           $restart_service = true
 ) {
 
-  include ::systemd
+  include systemd
 
   if $name !~ Pattern['^.+\.(service|socket|mount|swap)$'] {
     fail('$name must match Pattern["^.+\.(service|socket|mount|swap)$"]')

diff --git a/manifests/tmpfile.pp b/manifests/tmpfile.pp
@@ -31,7 +31,7 @@
   Optional[String]                  $content = undef,
   Optional[String]                  $source  = undef,
 ) {
-  include ::systemd::tmpfiles
+  include systemd::tmpfiles
 
   if $name =~ Pattern['/'] {
     fail('$name may not contain a forward slash "(/)"')

diff --git a/manifests/unit_file.pp b/manifests/unit_file.pp
@@ -34,7 +34,7 @@
   Optional[String]                  $source  = undef,
   Optional[Stdlib::Absolutepath]    $target  = undef,
 ) {
-  include ::systemd
+  include systemd
 
   assert_type(Systemd::Unit, $name)