Fix manifest compile errors with Puppet 6

klump · klump · commit d6388c868a24 · 2019-11-17T03:33:22.000+01:00
diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
@@ -4,8 +4,6 @@
 # license that can be found in the LICENSE file
 #
 
-include apt
-
 # == Class: hardware
 #
 # Install hardware specific packages and configs.
@@ -15,6 +13,9 @@
 # None. Everything is driven by facts.
 #
 class hardware {
+
+  include apt
+
   if defined('$::productname') and $::productname =~ /VMware/ {
     # OpenBSD does not use open-vm-tools, see the vmt(4) driver.
     if $::operatingsystem != 'OpenBSD' {

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`# license that can be found in the LICENSE file`
`5`	`5`	`#`
`6`	`6`
`7`		`-include apt`
`8`		`-`
`9`	`7`	`# == Class: hardware`
`10`	`8`	`#`
`11`	`9`	`# Install hardware specific packages and configs.`
`@@ -15,6 +13,9 @@`
`15`	`13`	`# None. Everything is driven by facts.`
`16`	`14`	`#`
`17`	`15`	`class hardware {`
	`16`	`+`
	`17`	`+ include apt`
	`18`	`+`
`18`	`19`	`if defined('$::productname') and $::productname =~ /VMware/ {`
`19`	`20`	`# OpenBSD does not use open-vm-tools, see the vmt(4) driver.`
`20`	`21`	`if $::operatingsystem != 'OpenBSD' {`