opendev/system-config
Code Issues Proposed changes

Create a grafana group

Browse Source 
Numeric hostnames don't match FQDN hiera groups, so we need to
create an explicit group.

Change-Id: Ie1e55b934b7d36cc1cb3434381660d7d27bbe979
This commit is contained in:
James E. Blair 2017-12-11 13:17:24 -08:00
parent 60e81a7011
commit 0e6b631233
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -96,6 +96,7 @@ node 'review-dev.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^grafana\d*\.openstack\.org$/ { node /^grafana\d*\.openstack\.org$/ {
$group = "grafana"
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80],
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),

1
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -18,3 +18,4 @@ wiki ~wiki\d+\.openstack\.org
wiki-dev ~wiki-dev\d+\.openstack\.org wiki-dev ~wiki-dev\d+\.openstack\.org
zuul-merger ~z[lm](static)?\d+\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org
zuul-executor ~ze\d+\.openstack\.org zuul-executor ~ze\d+\.openstack\.org
grafana ~grafana\d*\.openstack\.org