Skip to content
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

Jump to bottom

(CONT-651) Adjusting datatypes #540

Merged
merged 2 commits into from
Mar 2, 2023
Merged

(CONT-651) Adjusting datatypes #540

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
348ee20
(CONT-651) Adjusting Adjusting_datatypes
LukasAud Feb 22, 2023
c5563a4
Addressing feedback
LukasAud Mar 2, 2023
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
2 changes: 1 addition & 1 deletion manifests/balancermember.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
String $listening_service,
Enum['server', 'default-server', 'server-template'] $type = 'server',
Optional[Variant[Array, String]] $ports = undef,
Optional[Variant[String]] $port = undef,
Optional[Variant[String, Stdlib::Port]] $port = undef,
Variant[String[1], Array] $server_names = $hostname,
Variant[String, Array] $ipaddresses = $ipaddress,
String $prefix = 'server',
Expand Down
8 changes: 4 additions & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# @api private
define haproxy::config (
# lint:ignore:140chars
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $package_ensure,
String $instance_name,
Stdlib::Absolutepath $config_file,
Hash $global_options,
Hash $defaults_options,
String[1] $package_ensure,
Boolean $chroot_dir_manage,
Stdlib::Absolutepath $config_dir = undef, # A default is required for Puppet 2.7 compatibility. When 2.7 is no longer supported, this parameter default should be removed.
Optional[String] $custom_fragment = undef, # A default is required for Puppet 2.7 compatibility. When 2.7 is no longer supported, this parameter default should be removed. << Update 15/12/22 This still needs a default.
Boolean $merge_options = $haproxy::merge_options,
Stdlib::Absolutepath $config_dir = undef, # A default is required for Puppet 2.7 compatibility. When 2.7 is no longer supported, this parameter default should be removed.
LukasAud marked this conversation as resolved.
Show resolved Hide resolved
Optional[String] $custom_fragment = undef, # A default is required for Puppet 2.7 compatibility. When 2.7 is no longer supported, this parameter default should be removed. << Update 15/12/22 This still needs a default.
Boolean $merge_options = $haproxy::merge_options,
Variant[Stdlib::Absolutepath, String] $config_validate_cmd = $haproxy::config_validate_cmd,
# lint:endignore
) {
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
# }
#
class haproxy (
String[1] $package_ensure = 'present',
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $package_ensure = 'present',
String $package_name = $haproxy::params::package_name,
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = 'running',
Boolean $service_manage = true,
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @api private
define haproxy::install (
# lint:ignore:140chars
String[1] $package_ensure,
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $package_ensure,
Optional[String] $package_name = undef, # A default is required for Puppet 2.7 compatibility. When 2.7 is no longer supported, this parameter default should be removed.
# lint:endignore
) {
Expand Down
32 changes: 16 additions & 16 deletions manifests/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,22 +159,22 @@
# call haproxy::instance_service.
#
define haproxy::instance (
Optional[String] $package_name = undef,
String[1] $package_ensure = 'present',
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = 'running',
Boolean $service_manage = true,
Boolean $chroot_dir_manage = true,
Optional[String] $service_name = undef,
Optional[Hash] $global_options = undef,
Optional[Hash] $defaults_options = undef,
Optional[String] $restart_command = undef,
Optional[String] $custom_fragment = undef,
Optional[Stdlib::Absolutepath] $config_dir = undef,
Optional[Stdlib::Absolutepath] $config_file = undef,
Variant[Stdlib::Absolutepath, String] $config_validate_cmd = $haproxy::params::config_validate_cmd,
Boolean $merge_options = $haproxy::params::merge_options,
String $service_options = $haproxy::params::service_options,
String $sysconfig_options = $haproxy::params::sysconfig_options,
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $package_ensure = 'present',
Optional[String] $package_name = undef,
Variant[Enum['running', 'stopped'], Boolean] $service_ensure = 'running',
Boolean $service_manage = true,
Boolean $chroot_dir_manage = true,
Optional[String] $service_name = undef,
Optional[Hash] $global_options = undef,
Optional[Hash] $defaults_options = undef,
Optional[String] $restart_command = undef,
Optional[String] $custom_fragment = undef,
Optional[Stdlib::Absolutepath] $config_dir = undef,
Optional[Stdlib::Absolutepath] $config_file = undef,
Variant[Stdlib::Absolutepath, String] $config_validate_cmd = $haproxy::params::config_validate_cmd,
Boolean $merge_options = $haproxy::params::merge_options,
String $service_options = $haproxy::params::service_options,
String $sysconfig_options = $haproxy::params::sysconfig_options,
) {
# Since this is a 'define', we can not use 'inherts haproxy::params'.
# Therefore, we "include haproxy::params" for any parameters we need.
Expand Down
10 changes: 5 additions & 5 deletions manifests/mailer.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
# The instance name of the mailer entry. Default value: 'haproxy'.
#
define haproxy::mailer (
String $mailers_name,
Variant[String, Integer] $port,
Variant[String[1], Array] $server_names = $hostname,
Variant[String, Array] $ipaddresses = $ipaddress,
String $instance = 'haproxy',
String $mailers_name,
Variant[String, Stdlib::Port] $port,
Variant[String[1], Array] $server_names = $hostname,
Variant[String, Array] $ipaddresses = $ipaddress,
String $instance = 'haproxy',
) {
include haproxy::params
if $instance == 'haproxy' {
Expand Down
2 changes: 1 addition & 1 deletion manifests/peer.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#
define haproxy::peer (
String $peers_name,
Variant[String, Integer] $port,
Variant[String, Stdlib::Port] $port,
Variant[String[1], Array] $server_names = $hostname,
Variant[String, Array] $ipaddresses = $ipaddress,
String $instance = 'haproxy',
Expand Down