opendev
/
puppet-openstackci
Code Issues Proposed changes

Merge "Enable build logs and webapp"

This commit is contained in:
Zuul 2018-02-26 00:00:07 +00:00 committed by Gerrit Code Review
parent e84dd711d1 dd141f6ab9
commit 8c0380f50f
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
manifests/nodepool_builder.pp
View File

@ -25,12 +25,7 @@ class openstackci::nodepool_builder (
$environment = {},
$vhost_name = $::fqdn,
$statsd_host = '',
$image_log_document_root = '/var/log/nodepool/image',
$image_log_periodic_cleanup = true,
$enable_image_log_via_http = true,
$upload_log_document_root = '/var/log/nodepool/upload',
$upload_log_periodic_cleanup = true,
$enable_upload_log_via_http = false,
$enable_build_log_via_http = false,
$project_config_repo = '',
$project_config_base = undef,
$builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
@ -48,32 +43,27 @@ class openstackci::nodepool_builder (
}
class { '::nodepool':
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
git_source_repo => $git_source_repo,
revision => $revision,
vhost_name => $vhost_name,
statsd_host => $statsd_host,
image_log_document_root => $image_log_document_root,
image_log_periodic_cleanup => $image_log_periodic_cleanup,
enable_image_log_via_http => $enable_image_log_via_http,
upload_log_document_root => $upload_log_document_root,
upload_log_periodic_cleanup => $upload_log_periodic_cleanup,
enable_upload_log_via_http => $enable_upload_log_via_http,
environment => $environment,
nodepool_ssh_private_key => '',
scripts_dir => $::project_config::nodepool_scripts_dir,
elements_dir => $::project_config::nodepool_elements_dir,
require => $::project_config::config_dir,
install_mysql => false,
install_nodepool_builder => false,
python_version => $python_version,
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
git_source_repo => $git_source_repo,
revision => $revision,
vhost_name => $vhost_name,
statsd_host => $statsd_host,
environment => $environment,
nodepool_ssh_private_key => '',
scripts_dir => $::project_config::nodepool_scripts_dir,
elements_dir => $::project_config::nodepool_elements_dir,
require => $::project_config::config_dir,
install_mysql => false,
install_nodepool_builder => false,
python_version => $python_version,
}
class { '::nodepool::builder':
nodepool_ssh_public_key => $nodepool_ssh_public_key,
statsd_host => $statsd_host,
builder_logging_conf_template => $builder_logging_conf_template,
enable_build_log_via_http => $enable_build_log_via_http,
environment => $environment,
build_workers => $build_workers,
upload_workers => $upload_workers,

2
manifests/nodepool_launcher.pp
View File

@ -28,6 +28,7 @@ class openstackci::nodepool_launcher (
$project_config_base = undef,
$launcher_logging_conf_template = 'nodepool/nodepool-launcher.logging.conf.erb',
$python_version = 2,
$enable_webapp = false,
) {
if ! defined(Class['project_config']) {
@ -55,6 +56,7 @@ class openstackci::nodepool_launcher (
statsd_host => $statsd_host,
statsd_prefix => $statsd_prefix,
launcher_logging_conf_template => $launcher_logging_conf_template,
enable_webapp => $enable_webapp,
}
file { '/etc/nodepool/nodepool.yaml':