Merge pull request #592 from bastelfreak/mergeoptions

bastelfreak · web-flow · commit 2aefaddc70ca · 2023-11-20T09:01:10.000+01:00
merge_options: Switch default false-&gt;true
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -25,7 +25,6 @@
   } else {
     $_global_options   = $global_options
     $_defaults_options = $defaults_options
-    warning("${module_name}: The \$merge_options parameter will default to true in the next major release. Please review the documentation regarding the implications.") # lint:ignore:140chars
   }
 
   if defined(Class['haproxy']) {
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -6,8 +6,7 @@
 #   extended by changing package names and configuration file paths.
 #
 class haproxy::params {
-  # XXX: This will change to true in the next major release
-  $merge_options = false
+  $merge_options = true
 
   $service_options  = "ENABLED=1\n"  # Only used by Debian.
   $sysconfig_options = 'OPTIONS=""' #Only used by Redhat/CentOS etc

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`} else {`
`26`	`26`	`$_global_options = $global_options`
`27`	`27`	`$_defaults_options = $defaults_options`
`28`		`- warning("${module_name}: The \$merge_options parameter will default to true in the next major release. Please review the documentation regarding the implications.") # lint:ignore:140chars`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`if defined(Class['haproxy']) {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`	`# extended by changing package names and configuration file paths.`
`7`	`7`	`#`
`8`	`8`	`class haproxy::params {`
`9`		`- # XXX: This will change to true in the next major release`
`10`		`- $merge_options = false`
	`9`	`+ $merge_options = true`
`11`	`10`
`12`	`11`	`$service_options = "ENABLED=1\n" # Only used by Debian.`
`13`	`12`	`$sysconfig_options = 'OPTIONS=""' #Only used by Redhat/CentOS etc`