make picking haproxy::globals::sort_options_alphabetic work

all the pick statements for the sort_options_alphabetic are
useless, if the value is not optional !

Author: trefzer

manifests/backend.pp

@@ -44,7 +44,7 @@
 #
 # @param sort_options_alphabetic
 #   Sort options either alphabetic or custom like haproxy internal sorts them.
-#   Defaults to true.
+#   Defaults to undef (picking true from $haproxy::globals::sort_options_alphabetic).
 #
 # @param defaults
 #   Name of the defaults section this backend will use.
@@ -77,7 +77,7 @@
   },
   String                                  $instance                 = 'haproxy',
   String[1]                               $section_name             = $name,
-  Boolean                                 $sort_options_alphabetic  = true,
+  Optional[Boolean]                       $sort_options_alphabetic  = undef,
   Optional[String]                        $description              = undef,
   Optional[String]                        $defaults                 = undef,
   Optional[Stdlib::Absolutepath]          $config_file              = undef,

manifests/defaults.pp

@@ -14,7 +14,7 @@
 #
 # @param sort_options_alphabetic
 #   Sort options either alphabetic or custom like haproxy internal sorts them.
-#   Defaults to true.
+#   Defaults to undef (picking true from $haproxy::globals::sort_options_alphabetic).
 #
 # @param merge_options
 #   Whether to merge the user-supplied `options` hash with the
@@ -25,10 +25,10 @@
 #   Optional. Defaults to 'haproxy'.
 #
 define haproxy::defaults (
-  Hash    $options                  = {},
-  Boolean $sort_options_alphabetic  = true,
-  Boolean $merge_options            = $haproxy::params::merge_options,
-  String  $instance                 = 'haproxy',
+  Hash              $options                  = {},
+  Optional[Boolean] $sort_options_alphabetic  = undef,
+  Boolean           $merge_options            = $haproxy::params::merge_options,
+  String            $instance                 = 'haproxy',
 ) {
   if $instance == 'haproxy' {
     include haproxy

manifests/frontend.pp

@@ -45,7 +45,7 @@
 #
 # @param sort_options_alphabetic
 #   Sort options either alphabetic or custom like haproxy internal sorts them.
-#   Defaults to true.
+#   Defaults to undef (picking true from $haproxy::globals::sort_options_alphabetic).
 #
 # @param defaults
 #   Name of the defaults section this backend will use.
@@ -103,7 +103,7 @@
   },
   String                                  $instance                 = 'haproxy',
   String[1]                               $section_name             = $name,
-  Boolean                                 $sort_options_alphabetic  = true,
+  Optional[Boolean]                       $sort_options_alphabetic  = undef,
   Optional[String]                        $description              = undef,
   Optional[String]                        $defaults                 = undef,
   Boolean                                 $defaults_use_backend     = true,

manifests/listen.pp

@@ -61,7 +61,7 @@
 #
 # @param sort_options_alphabetic
 #   Sort options either alphabetic or custom like haproxy internal sorts them.
-#   Defaults to true.
+#   Defaults to undef (picking true from $haproxy::globals::sort_options_alphabetic).
 #
 # @param defaults
 #   Name of the defaults section this backend will use.
@@ -107,7 +107,7 @@
   },
   String                                  $instance                 = 'haproxy',
   String[1]                               $section_name             = $name,
-  Boolean                                 $sort_options_alphabetic  = true,
+  Optional[Boolean]                       $sort_options_alphabetic  = undef,
   Optional[String]                        $description              = undef,
   Optional[String]                        $defaults                 = undef,
   Optional[Stdlib::Absolutepath]          $config_file              = undef,

manifests/resolver.pp

@@ -62,7 +62,7 @@
 #
 # @param sort_options_alphabetic
 #   Sort options either alphabetic or custom like haproxy internal sorts them.
-#   Defaults to true.
+#   Defaults to undef (picking true from $haproxy::globals::sort_options_alphabetic).
 #
 # @param defaults
 #   Name of the defaults section this backend will use.
@@ -105,7 +105,7 @@
   Optional[Integer[512, 8192]]    $accepted_payload_size    = undef,
   String                          $instance                 = 'haproxy',
   String[1]                       $section_name             = $name,
-  Boolean                         $sort_options_alphabetic  = true,
+  Optional[Boolean]               $sort_options_alphabetic  = undef,
   Boolean                         $collect_exported         = true,
   Optional[Stdlib::Absolutepath]  $config_file              = undef,
   Optional[String]                $defaults                 = undef,