From dea63d6e7826b676e83a1bb6e417878d9b038f7d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 26 Mar 2024 14:23:53 +0100 Subject: [PATCH] replace legacy `merge()` with native puppet code --- manifests/service.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index 9b1c1758..ec73ba7f 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -30,8 +30,8 @@ 'SERVICE_DESCRIPTION' => '"logstash"', } - $settings = merge($default_settings, $logstash::settings) - $startup_options = merge($default_startup_options, $logstash::startup_options) + $settings = $default_settings + $logstash::settings + $startup_options = $default_startup_options + $logstash::startup_options $jvm_options = $logstash::jvm_options $jvm_options_defaults = $logstash::jvm_options_defaults $pipelines = $logstash::pipelines @@ -140,7 +140,7 @@ } #Older Amazon Linux AMIs has its release based on the year #it came out (2010 and up); the provider needed to be set explicitly; - #New Amazon Linux 2 AMIs has the release set to 2, Puppet can handle it + #New Amazon Linux 2 AMIs has the release set to 2, Puppet can handle it elsif($os =~ /amazon/ and versioncmp($release, '2000') > 0) { $service_provider = 'upstart' }