Workaround a change in behavior of ensure_packages with stdlib

martijndegouw · martijndegouw · commit 147dd989c9c2 · 2020-11-02T10:42:57.000+01:00
ensure_packages uses all parameters for the hash, but other instances of ensure_packages['net-tools'] do not all specify the before option. See https://tickets.puppetlabs.com/browse/MODULES-8733 Solving issue #275
diff --git a/manifests/enterprise/install/nix.pp b/manifests/enterprise/install/nix.pp
@@ -34,7 +34,7 @@
   if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 {
     ensure_packages(['net-tools'], {
         'ensure' => 'present',
-        before   => Package[$splunk::enterprise::enterprise_package_name]
     })
+    Package['net-tools'] -> Package[$splunk::enterprise::enterprise_package_name]
   }
 }
diff --git a/manifests/forwarder/install.pp b/manifests/forwarder/install.pp
@@ -64,8 +64,8 @@
   if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) {
     ensure_packages(['net-tools'], {
         'ensure' => 'present',
-        before   => Package[$splunk::forwarder::package_name]
     })
+    Package['net-tools'] -> Package[$splunk::forwarder::package_name]
   }
 
   package { $splunk::forwarder::package_name:

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 {`
`35`	`35`	`ensure_packages(['net-tools'], {`
`36`	`36`	`'ensure' => 'present',`
`37`		`- before => Package[$splunk::enterprise::enterprise_package_name]`
`38`	`37`	`})`
	`38`	`+ Package['net-tools'] -> Package[$splunk::enterprise::enterprise_package_name]`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@`
`64`	`64`	`if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) {`
`65`	`65`	`ensure_packages(['net-tools'], {`
`66`	`66`	`'ensure' => 'present',`
`67`		`- before => Package[$splunk::forwarder::package_name]`
`68`	`67`	`})`
	`68`	`+ Package['net-tools'] -> Package[$splunk::forwarder::package_name]`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`package { $splunk::forwarder::package_name:`