opendev/puppet-openstackci
Code Issues Proposed changes

Merge "Use project_config to get nodepool.yaml path"

Browse Source
This commit is contained in:
Jenkins 2016-08-03 13:44:41 +00:00 committed by Gerrit Code Review
commit c7da89711c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/nodepool.pp
View File

@ -18,7 +18,6 @@
class openstackci::nodepool ( class openstackci::nodepool (
$mysql_root_password, $mysql_root_password,
$mysql_password, $mysql_password,
$yaml_path = '/etc/project-config/nodepool/nodepool.yaml',
$git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool', $git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
$revision = 'master', $revision = 'master',
$oscc_file_contents, $oscc_file_contents,
@ -31,6 +30,7 @@ class openstackci::nodepool (
$image_log_periodic_cleanup = true, $image_log_periodic_cleanup = true,
$enable_image_log_via_http = true, $enable_image_log_via_http = true,
$project_config_repo = '', $project_config_repo = '',
$project_config_base = undef,
$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 = [],
@ -41,6 +41,7 @@ class openstackci::nodepool (
if ! defined(Class['project_config']) { if ! defined(Class['project_config']) {
class { '::project_config': class { '::project_config':
url => $project_config_repo, url => $project_config_repo,
base => $project_config_base,
} }
} }
@ -69,7 +70,7 @@ class openstackci::nodepool (
file { '/etc/nodepool/nodepool.yaml': file { '/etc/nodepool/nodepool.yaml':
ensure => present, ensure => present,
source => $yaml_path, source => $::project_config::nodepool_config_file,
owner => 'nodepool', owner => 'nodepool',
group => 'root', group => 'root',
mode => '0400', mode => '0400',