Skip to content

make picking haproxy::globals::sort_options_alphabetic work #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make picking haproxy::globals::sort_options_alphabetic work #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/backend.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions manifests/defaults.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions manifests/frontend.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions manifests/listen.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions manifests/resolver.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down
Loading