opendev/puppet-openstackci
Code Issues Proposed changes

Support nodepool builder logging config

Browse Source 
We have split the logging config files between the main nodepool daemon
and the nodepool image builder. We need to support configuring both in
this puppet module.

Change-Id: I013835621dfbc311a0f7bd7c957b7d4656dfa628
Depends-On: I990e96dde352fb7d01cc4b89d0f4f02de166b943
This commit is contained in:
Clark Boylan
2016-01-29 10:19:24 -08:00
parent 8578e7f803
commit 0b04e070dd
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/nodepool.pp
View File

@@ -30,6 +30,7 @@ class openstackci::nodepool (
$enable_image_log_via_http = true,
$project_config_repo = '',
$logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
$builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
$jenkins_masters = [],
) {
@@ -40,21 +41,22 @@ class openstackci::nodepool (
}
class { '::nodepool':
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
git_source_repo => $git_source_repo,
revision => $revision,
vhost_name => $vhost_name,
statsd_host => $statsd_host,
image_log_document_root => $image_log_document_root,
enable_image_log_via_http => $enable_image_log_via_http,
environment => $environment,
scripts_dir => $::project_config::nodepool_scripts_dir,
elements_dir => $::project_config::nodepool_elements_dir,
require => $::project_config::config_dir,
logging_conf_template => $logging_conf_template,
jenkins_masters => $jenkins_masters,
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
git_source_repo => $git_source_repo,
revision => $revision,
vhost_name => $vhost_name,
statsd_host => $statsd_host,
image_log_document_root => $image_log_document_root,
enable_image_log_via_http => $enable_image_log_via_http,
environment => $environment,
scripts_dir => $::project_config::nodepool_scripts_dir,
elements_dir => $::project_config::nodepool_elements_dir,
require => $::project_config::config_dir,
logging_conf_template => $logging_conf_template,
builder_logging_conf_template => $builder_logging_conf_template,
jenkins_masters => $jenkins_masters,
}
file { '/etc/nodepool/nodepool.yaml':