Skip to content

Commit

Permalink
Add variable quartz_job_threadCount
Browse files Browse the repository at this point in the history
  • Loading branch information
danifr committed Nov 25, 2016
1 parent 2c0c67b commit aa8c0ba
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 1 deletion.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ The organization value that will be set by default for any projects.

The description that will be set by default for any projects.

##### `quartz_job_threadCount`

The maximum number of threads used by Rundeck for concurrent jobs by default is set to 10.

##### `rd_loglevel`

The log4j logging level to be set for the Rundeck application.
Expand Down
1 change: 1 addition & 0 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
$projects_description = $rundeck::projects_default_desc,
$projects_organization = $rundeck::projects_default_org,
$projects_storage_type = $rundeck::projects_storage_type,
$quartz_job_threadCount = $rundeck::quartz_job_threadCount,
$rd_loglevel = $rundeck::rd_loglevel,
$rd_auditlevel = $rundeck::rd_auditlevel,
$rdeck_config_template = $rundeck::rdeck_config_template,
Expand Down
3 changes: 2 additions & 1 deletion manifests/config/global/rundeck_config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@
$file_keystorage_dir = $rundeck::config::file_keystorage_dir,
$grails_server_url = $rundeck::config::grails_server_url,
$group = $rundeck::config::group,
$gui_config = $rundeck::config::gui_config,
$key_storage_type = $rundeck::config::key_storage_type,
$mail_config = $rundeck::config::mail_config,
$preauthenticated_config = $rundeck::config::preauthenticated_config,
$projects_storage_type = $rundeck::config::projects_storage_type,
$properties_dir = $rundeck::config::properties_dir,
$quartz_job_threadCount = $rundeck::config::quartz_job_threadCount,
$rd_loglevel = $rundeck::config::loglevel,
$rdeck_base = $rundeck::config::rdeck_base,
$rdeck_config_template = $rundeck::config::rdeck_config_template,
$rss_enabled = $rundeck::config::rss_enabled,
$security_config = $rundeck::config::security_config,
$user = $rundeck::config::user,
$gui_config = $rundeck::config::gui_config,
) {

$properties_file = "${properties_dir}/rundeck-config.groovy"
Expand Down
5 changes: 5 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
# [*properties_dir*]
# The path to the configuration directory where the properties file are stored.
#
# [*quartz_job_threadCount*]
# The maximum number of threads used by Rundeck for concurrent jobs by default is set to 10.
#
# [*rd_loglevel*]
# The log4j logging level to be set for the Rundeck application.
#
Expand Down Expand Up @@ -212,6 +215,7 @@
$projects_description = $rundeck::params::projects_default_desc,
$projects_organization = $rundeck::params::projects_default_org,
$projects_storage_type = $rundeck::params::projects_storage_type,
$quartz_job_threadCount = $rundeck::params::quartz_job_threadCount,
$rd_loglevel = $rundeck::params::loglevel,
$rd_auditlevel = $rundeck::params::loglevel,
$rdeck_config_template = $rundeck::params::rdeck_config_template,
Expand Down Expand Up @@ -268,6 +272,7 @@
validate_string($package_ensure)
validate_hash($mail_config)
validate_hash($preauthenticated_config)
validate_integer($quartz_job_threadCount)
validate_string($user)
validate_string($group)
validate_string($server_web_context)
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@
'delimiter' => ':',
}

$quartz_job_threadCount = 10

$server_web_context = undef
$jvm_args = '-Xmx1024m -Xms256m -server'

Expand Down
2 changes: 2 additions & 0 deletions spec/classes/config/global/rundeck_config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
rundeck.security.authorization.preauthenticated.attributeName = "REMOTE_USER_GROUPS"
rundeck.security.authorization.preauthenticated.delimiter = ":"
quartz.props.threadPool.threadCount = "10"
CONFIG

it do
Expand Down
1 change: 1 addition & 0 deletions templates/rundeck-config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ grails.serverURL = "<%= @grails_server_url %>"
rundeck.clusterMode.enabled = "<%= @clustermode_enabled %>"

rundeck.projectsStorageType = "<%= @projects_storage_type %>"
quartz.props.threadPool.threadCount = "<%= @quartz_job_threadCount %>"

<%- if @key_storage_type == 'file' -%>
rundeck.storage.provider."1".type = "file"
Expand Down

0 comments on commit aa8c0ba

Please sign in to comment.