From 00712283f0bb2609dbf242368c5a4e196afa88a8 Mon Sep 17 00:00:00 2001 From: Alexander Fisher Date: Tue, 22 May 2018 08:56:29 +0100 Subject: [PATCH] Allow arrays for `server_jvm_extra_args` parameter 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 --- manifests/init.pp | 2 +- manifests/server.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3892946b..55d9dac1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/manifests/server.pp b/manifests/server.pp index e8f3cae4..8e82ed55 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -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,