From 9acd916d4f378563bab071177fba9b05f7df9472 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Feb 2019 07:34:18 -0800 Subject: [PATCH] Remove top level hiera lookups Puppet4 is a lot more picky about scoping of variables. In our hiera lookups we rely on the $group var to specify where to find hiera data files, but this group var is set on a per node basis. This means that top level hiera lookups produce warnings like: Undefined variable 'group'; (file & line not available) And lookups will break if they need keys in the group/node specific data files. Avoid this problem entirely by removing top level lookups. We only had one for our elasticsearch_nodes var which we can easily set statically in site.pp and not rely on hiera for. Change-Id: Ifa3740f0f31c3fa9a2d8faa355101d3a5671afff --- hiera/common.yaml | 7 ------- manifests/site.pp | 12 +++++++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index e294935667..04b8c4221a 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -1,11 +1,4 @@ --- -elasticsearch_nodes: -- elasticsearch02.openstack.org -- elasticsearch03.openstack.org -- elasticsearch04.openstack.org -- elasticsearch05.openstack.org -- elasticsearch06.openstack.org -- elasticsearch07.openstack.org infra_apache_serveradmin: noc@openstack.org statusbot_channels: - airshipit diff --git a/manifests/site.pp b/manifests/site.pp index a7e3c61575..1b1c10a047 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -5,7 +5,17 @@ # in between any two variables in order for them to be correctly parsed and # passed around in test.sh # -$elasticsearch_nodes = hiera_array('elasticsearch_nodes') +# Note we do not do a hiera lookup here as we set $group on a per node basis +# and that must be set before we can do hiera lookups. Doing a hiera lookup +# here would fail to find any group specific info. +$elasticsearch_nodes = [ + "elasticsearch02.openstack.org", + "elasticsearch03.openstack.org", + "elasticsearch04.openstack.org", + "elasticsearch05.openstack.org", + "elasticsearch06.openstack.org", + "elasticsearch07.openstack.org", +] # # Default: should at least behave like an openstack server