opendev
/
puppet-openstackci
Code Issues Proposed changes

Use nodepool::builder for nodepool 

We need to start decoupling nodepool more as we plan to start scaling
up nodepool-builder servers.

Change-Id: Ia58d7d038e99df2efa18bdaa6a8440f71e036906
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-17 10:14:45 -04:00 committed by James E. Blair
parent 48fd0cc79a
commit d0c612fd51
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
manifests/nodepool.pp
View File

@ -44,6 +44,7 @@ class openstackci::nodepool (
$mysql_host = 'localhost',
$mysql_user_name = 'nodepool',
$split_daemon = false,
$install_nodepool_builder = true,
) {
if ! defined(Class['project_config']) {
@ -54,34 +55,43 @@ class openstackci::nodepool (
}
class { '::nodepool':
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
nodepool_ssh_public_key => $nodepool_ssh_public_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,
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,
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,
build_workers => $build_workers,
upload_workers => $upload_workers,
install_mysql => $install_mysql,
mysql_db_name => $mysql_db_name,
mysql_host => $mysql_host,
mysql_user_name => $mysql_user_name,
split_daemon => $split_daemon,
mysql_root_password => $mysql_root_password,
mysql_password => $mysql_password,
nodepool_ssh_private_key => $nodepool_ssh_private_key,
nodepool_ssh_public_key => $nodepool_ssh_public_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,
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,
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,
install_mysql => $install_mysql,
mysql_db_name => $mysql_db_name,
mysql_host => $mysql_host,
mysql_user_name => $mysql_user_name,
split_daemon => $split_daemon,
install_nodepool_builder => false,
}
if (install_nodepool_builder) {
class { '::nodepool::builder':
statsd_host => $statsd_host,
image_log_document_root => $image_log_document_root,
builder_logging_conf_template => $builder_logging_conf_template,
environment => $environment,
build_workers => $build_workers,
upload_workers => $upload_workers,
}
}
file { '/etc/nodepool/nodepool.yaml':