Use project_config to get nodepool.yaml path
Make it consistent with how puppet-project_config settings are used across the infra. We remove no longer used yaml_path arg. This could break puppet configuration for those who set the parameter to a different value. I could add logic to still allow the use of yaml_path, but that seems too much extra complexity for a marginal benefit. Currently, nodepool node defined in system-config does not set yaml_path. Depends-On: I9aeac79b7039c1e3c2db93b52587ec948a7fbf91 Change-Id: I0cb03ba0256fac5d789941cc16f8f8ade75a3c33
This commit is contained in:
parent
0b04e070dd
commit
e9047e71f7
@ -18,7 +18,6 @@
|
||||
class openstackci::nodepool (
|
||||
$mysql_root_password,
|
||||
$mysql_password,
|
||||
$yaml_path = '/etc/project-config/nodepool/nodepool.yaml',
|
||||
$git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
|
||||
$revision = 'master',
|
||||
$oscc_file_contents,
|
||||
@ -29,6 +28,7 @@ class openstackci::nodepool (
|
||||
$image_log_document_root = '/var/log/nodepool/image',
|
||||
$enable_image_log_via_http = true,
|
||||
$project_config_repo = '',
|
||||
$project_config_base = undef,
|
||||
$logging_conf_template = 'nodepool/nodepool.logging.conf.erb',
|
||||
$builder_logging_conf_template = 'nodepool/nodepool-builder.logging.conf.erb',
|
||||
$jenkins_masters = [],
|
||||
@ -37,6 +37,7 @@ class openstackci::nodepool (
|
||||
if ! defined(Class['project_config']) {
|
||||
class { 'project_config':
|
||||
url => $project_config_repo,
|
||||
base => $project_config_base,
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,7 +62,7 @@ class openstackci::nodepool (
|
||||
|
||||
file { '/etc/nodepool/nodepool.yaml':
|
||||
ensure => present,
|
||||
source => $yaml_path,
|
||||
source => $::project_config::nodepool_config_file,
|
||||
owner => 'nodepool',
|
||||
group => 'root',
|
||||
mode => '0400',
|
||||
|
Loading…
x
Reference in New Issue
Block a user