From da5a45878a06338b6568a4dbd786a2233ed34750 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 20 Feb 2018 14:47:05 +1100 Subject: [PATCH] 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 --- manifests/nodepool_builder.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/nodepool_builder.pp b/manifests/nodepool_builder.pp index 1004e32..ac4f7ed 100644 --- a/manifests/nodepool_builder.pp +++ b/manifests/nodepool_builder.pp @@ -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',