opendev/system-config
Code Issues Proposed changes

Merge "Remove top level hiera lookups"

Browse Source
This commit is contained in:
Zuul 2019-02-11 20:31:54 +00:00 committed by Gerrit Code Review
commit c3aa4ec595
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hiera/common.yaml
View File

@ -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 infra_apache_serveradmin: noc@openstack.org
statusbot_channels: statusbot_channels:
- airshipit - airshipit

12
manifests/site.pp
View File

@ -5,7 +5,17 @@
# in between any two variables in order for them to be correctly parsed and # in between any two variables in order for them to be correctly parsed and
# passed around in test.sh # 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 # Default: should at least behave like an openstack server