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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user