From 0e6b631233b20ee850d05ace7004026f0de8afc8 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 11 Dec 2017 13:17:24 -0800 Subject: [PATCH] Create a grafana group Numeric hostnames don't match FQDN hiera groups, so we need to create an explicit group. Change-Id: Ie1e55b934b7d36cc1cb3434381660d7d27bbe979 --- manifests/site.pp | 1 + modules/openstack_project/files/puppetmaster/groups.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index b6f8cfb081..1a30ef5dcb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -96,6 +96,7 @@ node 'review-dev.openstack.org' { # Node-OS: trusty # Node-OS: xenial node /^grafana\d*\.openstack\.org$/ { + $group = "grafana" class { 'openstack_project::server': iptables_public_tcp_ports => [80], sysadmins => hiera('sysadmins', []), diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index 638f2c606c..c9bcec6c69 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -18,3 +18,4 @@ wiki ~wiki\d+\.openstack\.org wiki-dev ~wiki-dev\d+\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org zuul-executor ~ze\d+\.openstack\.org +grafana ~grafana\d*\.openstack\.org