summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2017-09-21 11:12:20 -0400
committerPaul Belanger <pabelanger@redhat.com>2017-09-21 11:12:20 -0400
commit8310d56085732ddfbaa43442b6c2ba2061d9d1f4 (patch)
tree33389724b98e0659c7307d640cbab2afe2eb6175
parent4a95622eae99f37f653b4a274179c9e539fb023e (diff)
Use ::fqdn for nodepoolv3 yaml file
What we really want to the fqdn, since that is how we store the filename in project-config. Change-Id: Ie1337ce233bc7f270acfcdab7632326d412b05e5 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 21 Sep 2017 16:53:49 +0000 Reviewed-on: https://review.openstack.org/506239 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 7a7f15e..e81c163 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/${::hostname}.yaml" 55 $nodepool_config_file_zuulv3 = "/etc/project-config/${base}nodepool/${::fqdn}.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}