From b72fc617175f22d53d8b9757cb4c7d0711077b2e Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 9 May 2016 19:45:01 -0400 Subject: [PATCH] Expose nodepool-builder worker settings 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 --- manifests/builder.pp | 2 ++ manifests/init.pp | 5 ++++- templates/nodepool-builder.default.erb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/builder.pp b/manifests/builder.pp index 3d1baf0..36c1a44 100644 --- a/manifests/builder.pp +++ b/manifests/builder.pp @@ -19,6 +19,8 @@ class nodepool::builder( $image_log_document_root = '/var/log/nodepool/image', $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb', $environment = {}, + $build_workers = '1', + $upload_workers = '4', ) { file { '/etc/init.d/nodepool-builder': diff --git a/manifests/init.pp b/manifests/init.pp index 7c4f8f4..603ad39 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -36,6 +36,8 @@ class nodepool ( $logging_conf_template = 'nodepool/nodepool.logging.conf.erb', $builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb', $jenkins_masters = [], + $build_workers = '1', + $upload_workers = '4', ) { @@ -334,6 +336,7 @@ class nodepool ( statsd_host => $statsd_host, environment => $environment, builder_logging_conf_template => $builder_logging_conf_template, + build_workers => $build_workers, + upload_workers => $upload_workers, } - } diff --git a/templates/nodepool-builder.default.erb b/templates/nodepool-builder.default.erb index 9dd7d26..263c254 100644 --- a/templates/nodepool-builder.default.erb +++ b/templates/nodepool-builder.default.erb @@ -5,4 +5,4 @@ export STATSD_PORT=8125 <% @environment.keys.sort.each do |key| -%> export <%= key %>='<%= @environment[key] %>' <% 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 %>"