opendev
/
puppet-openstackci
Code Issues Proposed changes

nodepool-builder: look for fqdn config first 

$::project_config::nodepool_config_file_zuulv3 is set as the fqdn of
the host.  So far it is only used for nodepool-launchers.

We wish to have the ability to create custom configuration files for
nodepool-builders too.  Add the fqdn variable as the first match for
the builder config.  If no more specific config, the default should
remain.

Change-Id: Ibdd8bca3f1e0a1f6709be29c37fe9a696a7bb2d4
This commit is contained in:
Ian Wienand 2018-02-20 14:47:05 +11:00
parent 3eacddb2d7
commit da5a45878a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/nodepool_builder.pp
View File

@ -83,7 +83,8 @@ class openstackci::nodepool_builder (
file { '/etc/nodepool/nodepool.yaml':
ensure => present,
source => $::project_config::nodepool_config_file,
source => [$::project_config::nodepool_config_file_zuulv3,
$::project_config::nodepool_config_file],
owner => 'nodepool',
group => 'root',
mode => '0400',