Skip to content

Commit

Permalink
Allow arrays for server_jvm_extra_args parameter
Browse files Browse the repository at this point in the history
The tests for puppet::server::puppetserver already cover using an array
of strings for this parameter, but the base classes forbid it.
https://github.com/theforeman/puppet-puppet/blob/ee01cffe239c5080c784d17a37a34742fc7db0fe/spec/classes/puppet_server_puppetserver_spec.rb#L823
  • Loading branch information
alexjfisher committed May 22, 2018
1 parent ee01cff commit 0071228
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@
String $server_jvm_config = $puppet::params::server_jvm_config,
Pattern[/^[0-9]+[kKmMgG]$/] $server_jvm_min_heap_size = $puppet::params::server_jvm_min_heap_size,
Pattern[/^[0-9]+[kKmMgG]$/] $server_jvm_max_heap_size = $puppet::params::server_jvm_max_heap_size,
String $server_jvm_extra_args = $puppet::params::server_jvm_extra_args,
Variant[String,Array[String]] $server_jvm_extra_args = $puppet::params::server_jvm_extra_args,
Optional[String] $server_jvm_cli_args = $puppet::params::server_jvm_cli_args,
Optional[Stdlib::Absolutepath] $server_jruby_gem_home = $puppet::params::server_jruby_gem_home,
Integer[1] $server_max_active_instances = $puppet::params::server_max_active_instances,
Expand Down
2 changes: 1 addition & 1 deletion manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
String $jvm_config = $::puppet::server_jvm_config,
Pattern[/^[0-9]+[kKmMgG]$/] $jvm_min_heap_size = $::puppet::server_jvm_min_heap_size,
Pattern[/^[0-9]+[kKmMgG]$/] $jvm_max_heap_size = $::puppet::server_jvm_max_heap_size,
String $jvm_extra_args = $::puppet::server_jvm_extra_args,
Variant[String,Array[String]] $jvm_extra_args = $::puppet::server_jvm_extra_args,
Optional[String] $jvm_cli_args = $::puppet::server_jvm_cli_args,
Optional[Stdlib::Absolutepath] $jruby_gem_home = $::puppet::server_jruby_gem_home,
Integer[1] $max_active_instances = $::puppet::server_max_active_instances,
Expand Down

0 comments on commit 0071228

Please sign in to comment.