summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2017-09-15 15:28:24 -0400
committerPaul Belanger <pabelanger@redhat.com>2017-09-15 15:28:24 -0400
commit4a95622eae99f37f653b4a274179c9e539fb023e (patch)
treece6315af5097477e99da6ae2225b796c67b22737
parent231ce9335b11de5d3c9fbfd822696e7c1d12f427 (diff)
Update nodepool_config_file_zuulv3 to use hostname
Switch to use hostname to find the nodepoolv3 configuration file from project-config. Change-Id: I7c8d37c747083cc34c5ed9632be002ed0c6f4b9b Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Code-Review+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 21 Sep 2017 06:51:37 +0000 Reviewed-on: https://review.openstack.org/504500 Project: openstack-infra/puppet-project_config Branch: refs/heads/master
-rw-r--r--manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index ed28b06..7a7f15e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,7 +52,7 @@ class project_config(
52 $nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts" 52 $nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts"
53 $nodepool_elements_dir = "/etc/project-config/${base}nodepool/elements" 53 $nodepool_elements_dir = "/etc/project-config/${base}nodepool/elements"
54 $nodepool_config_file = "/etc/project-config/${base}nodepool/nodepool.yaml" 54 $nodepool_config_file = "/etc/project-config/${base}nodepool/nodepool.yaml"
55 $nodepool_config_file_zuulv3 = "/etc/project-config/${base}nodepool/nodepoolv3.yaml" 55 $nodepool_config_file_zuulv3 = "/etc/project-config/${base}nodepool/${::hostname}.yaml"
56 $zuul_layout_dir = "/etc/project-config/${base}zuul" 56 $zuul_layout_dir = "/etc/project-config/${base}zuul"
57 $zuul_site_variables_yaml = "/etc/project-config/${base}zuul/site-variables.yaml" 57 $zuul_site_variables_yaml = "/etc/project-config/${base}zuul/site-variables.yaml"
58} 58}