opendev/puppet-nodepool
Code Issues Proposed changes

Expose nodepool-builder worker settings

Browse Source 
This allows a user to tweak nodepool-builder image workers over using
static settings.

Change-Id: I54c879e1607d960629a2ed64efddff99491b6440
Depends-On: I5268e0ca34ab91ffae7a203ca710eecf571585e5
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-05-09 19:45:01 -04:00
parent e658ba3c7c
commit b72fc61717
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/builder.pp
View File

@ -19,6 +19,8 @@ class nodepool::builder(
$image_log_document_root = '/var/log/nodepool/image', $image_log_document_root = '/var/log/nodepool/image',
$builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb', $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
$environment = {}, $environment = {},
$build_workers = '1',
$upload_workers = '4',
) { ) {
file { '/etc/init.d/nodepool-builder': file { '/etc/init.d/nodepool-builder':

5
manifests/init.pp
View File

@ -36,6 +36,8 @@ class nodepool (
$logging_conf_template = 'nodepool/nodepool.logging.conf.erb', $logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
$builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb', $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
$jenkins_masters = [], $jenkins_masters = [],
$build_workers = '1',
$upload_workers = '4',
) { ) {
@ -334,6 +336,7 @@ class nodepool (
statsd_host => $statsd_host, statsd_host => $statsd_host,
environment => $environment, environment => $environment,
builder_logging_conf_template => $builder_logging_conf_template, builder_logging_conf_template => $builder_logging_conf_template,
build_workers => $build_workers,
upload_workers => $upload_workers,
} }
} }

2
templates/nodepool-builder.default.erb
View File

@ -5,4 +5,4 @@ export STATSD_PORT=8125
<% @environment.keys.sort.each do |key| -%> <% @environment.keys.sort.each do |key| -%>
export <%= key %>='<%= @environment[key] %>' export <%= key %>='<%= @environment[key] %>'
<% end -%> <% end -%>
DAEMON_ARGS="-c /etc/nodepool/nodepool.yaml -l /etc/nodepool/builder-logging.conf" DAEMON_ARGS="-c /etc/nodepool/nodepool.yaml -l /etc/nodepool/builder-logging.conf --build-workers <%= @build_workers %> --upload-workers <%= @upload_workers %>"