From d13bb31303ada9007143aecf33ba5b1262edbe2b Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@cat.pdx.edu>
Date: Wed, 30 Dec 2015 14:43:25 -0800
Subject: [PATCH] Move cacti hosts to hiera
Lists of hosts is data, not code
Change-Id: Iee1912d9031d76b06e613b5a4d095b53ca93b46d
---
hiera/common.yaml | 100 ++++++++++++++++++
manifests/site.pp | 3 +-
modules/openstack_project/manifests/cacti.pp | 105 +------------------
3 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/hiera/common.yaml b/hiera/common.yaml
index ef9fb07c34..ac5a41520b 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -199,3 +199,103 @@ meetbot_channels:
- '#swift3'
- '#tacker'
- '#tripleo'
+cacti_hosts:
+- afs01.dfw.openstack.org
+- afs01.ord.openstack.org
+- afsdb01.openstack.org
+- afsdb02.openstack.org
+- apps.openstack.org
+- ask.openstack.org
+- eavesdrop.openstack.org
+- elasticsearch01.openstack.org
+- elasticsearch02.openstack.org
+- elasticsearch03.openstack.org
+- elasticsearch04.openstack.org
+- elasticsearch05.openstack.org
+- elasticsearch06.openstack.org
+- elasticsearch07.openstack.org
+- etherpad-dev.openstack.org
+- etherpad.openstack.org
+- git.openstack.org
+- git01.openstack.org
+- git02.openstack.org
+- git03.openstack.org
+- git04.openstack.org
+- git05.openstack.org
+- git06.openstack.org
+- git07.openstack.org
+- git08.openstack.org
+- grafana.openstack.org
+- graphite.openstack.org
+- groups-dev.openstack.org
+- groups.openstack.org
+- health.openstack.org
+- jenkins-dev.openstack.org
+- jenkins.openstack.org
+- jenkins01.openstack.org
+- jenkins02.openstack.org
+- jenkins03.openstack.org
+- jenkins04.openstack.org
+- jenkins05.openstack.org
+- jenkins06.openstack.org
+- jenkins07.openstack.org
+- kdc01.openstack.org
+- kdc02.openstack.org
+- lists.openstack.org
+- logstash-worker01.openstack.org
+- logstash-worker02.openstack.org
+- logstash-worker03.openstack.org
+- logstash-worker04.openstack.org
+- logstash-worker05.openstack.org
+- logstash-worker06.openstack.org
+- logstash-worker07.openstack.org
+- logstash-worker08.openstack.org
+- logstash-worker09.openstack.org
+- logstash-worker10.openstack.org
+- logstash-worker11.openstack.org
+- logstash-worker12.openstack.org
+- logstash-worker13.openstack.org
+- logstash-worker14.openstack.org
+- logstash-worker15.openstack.org
+- logstash-worker16.openstack.org
+- logstash-worker17.openstack.org
+- logstash-worker18.openstack.org
+- logstash-worker19.openstack.org
+- logstash-worker20.openstack.org
+- logstash.openstack.org
+- nodepool.openstack.org
+- openstackid.org
+- paste.openstack.org
+- pbx.openstack.org
+- planet.openstack.org
+- proposal.slave.openstack.org
+- puppetdb.openstack.org
+- puppetmaster.openstack.org
+- pypi.bhs1.openstack.org
+- pypi.dfw.openstack.org
+- pypi.gra1.openstack.org
+- pypi.iad.openstack.org
+- pypi.nyj01.openstack.org
+- pypi.openstack.org
+- pypi.ord.openstack.org
+- pypi.region-b.geo-1.openstack.org
+- pypi.regionone.openstack.org
+- release.slave.openstack.org
+- review-dev.openstack.org
+- review.openstack.org
+- stackalytics.openstack.org
+- static.openstack.org
+- status.openstack.org
+- subunit-worker01.openstack.org
+- translate.openstack.org
+- translate-dev.openstack.org
+- wiki.openstack.org
+- zm01.openstack.org
+- zm02.openstack.org
+- zm03.openstack.org
+- zm04.openstack.org
+- zm05.openstack.org
+- zm06.openstack.org
+- zm07.openstack.org
+- zm08.openstack.org
+- zuul.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 4b54e39fb5..5ec9c508b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -210,7 +210,8 @@ node 'jenkins-dev.openstack.org' {
node 'cacti.openstack.org' {
include openstack_project::ssl_cert_check
class { 'openstack_project::cacti':
- sysadmins => hiera('sysadmins', []),
+ sysadmins => hiera('sysadmins', []),
+ cacti_hosts => hiera('cacti_hosts'),
}
}
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 262f943890..17fbf0e6fc 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -1,6 +1,7 @@
# Class to configure cacti on a node.
class openstack_project::cacti (
- $sysadmins = []
+ $sysadmins = [],
+ $cacti_hosts = [],
) {
if $::osfamily != 'Debian' {
@@ -72,107 +73,5 @@ class openstack_project::cacti (
require => File['/var/lib/cacti/linux_host.xml'],
}
- $cacti_hosts = [
- 'afs01.dfw.openstack.org',
- 'afs01.ord.openstack.org',
- 'afsdb01.openstack.org',
- 'afsdb02.openstack.org',
- 'apps.openstack.org',
- 'ask.openstack.org',
- 'eavesdrop.openstack.org',
- 'elasticsearch01.openstack.org',
- 'elasticsearch02.openstack.org',
- 'elasticsearch03.openstack.org',
- 'elasticsearch04.openstack.org',
- 'elasticsearch05.openstack.org',
- 'elasticsearch06.openstack.org',
- 'elasticsearch07.openstack.org',
- 'etherpad-dev.openstack.org',
- 'etherpad.openstack.org',
- 'git.openstack.org',
- 'git01.openstack.org',
- 'git02.openstack.org',
- 'git03.openstack.org',
- 'git04.openstack.org',
- 'git05.openstack.org',
- 'git06.openstack.org',
- 'git07.openstack.org',
- 'git08.openstack.org',
- 'grafana.openstack.org',
- 'graphite.openstack.org',
- 'groups-dev.openstack.org',
- 'groups.openstack.org',
- 'health.openstack.org',
- 'jenkins-dev.openstack.org',
- 'jenkins.openstack.org',
- 'jenkins01.openstack.org',
- 'jenkins02.openstack.org',
- 'jenkins03.openstack.org',
- 'jenkins04.openstack.org',
- 'jenkins05.openstack.org',
- 'jenkins06.openstack.org',
- 'jenkins07.openstack.org',
- 'kdc01.openstack.org',
- 'kdc02.openstack.org',
- 'lists.openstack.org',
- 'logstash-worker01.openstack.org',
- 'logstash-worker02.openstack.org',
- 'logstash-worker03.openstack.org',
- 'logstash-worker04.openstack.org',
- 'logstash-worker05.openstack.org',
- 'logstash-worker06.openstack.org',
- 'logstash-worker07.openstack.org',
- 'logstash-worker08.openstack.org',
- 'logstash-worker09.openstack.org',
- 'logstash-worker10.openstack.org',
- 'logstash-worker11.openstack.org',
- 'logstash-worker12.openstack.org',
- 'logstash-worker13.openstack.org',
- 'logstash-worker14.openstack.org',
- 'logstash-worker15.openstack.org',
- 'logstash-worker16.openstack.org',
- 'logstash-worker17.openstack.org',
- 'logstash-worker18.openstack.org',
- 'logstash-worker19.openstack.org',
- 'logstash-worker20.openstack.org',
- 'logstash.openstack.org',
- 'nodepool.openstack.org',
- 'openstackid.org',
- 'paste.openstack.org',
- 'pbx.openstack.org',
- 'planet.openstack.org',
- 'proposal.slave.openstack.org',
- 'puppetdb.openstack.org',
- 'puppetmaster.openstack.org',
- 'pypi.bhs1.openstack.org',
- 'pypi.dfw.openstack.org',
- 'pypi.gra1.openstack.org',
- 'pypi.iad.openstack.org',
- 'pypi.nyj01.openstack.org',
- 'pypi.openstack.org',
- 'pypi.ord.openstack.org',
- 'pypi.region-b.geo-1.openstack.org',
- 'pypi.regionone.openstack.org',
- 'release.slave.openstack.org',
- 'review-dev.openstack.org',
- 'review.openstack.org',
- 'stackalytics.openstack.org',
- 'static.openstack.org',
- 'status.openstack.org',
- 'subunit-worker01.openstack.org',
- 'translate.openstack.org',
- 'translate-dev.openstack.org',
- 'wiki.openstack.org',
- 'zm01.openstack.org',
- 'zm02.openstack.org',
- 'zm03.openstack.org',
- 'zm04.openstack.org',
- 'zm05.openstack.org',
- 'zm06.openstack.org',
- 'zm07.openstack.org',
- 'zm08.openstack.org',
- 'zuul.openstack.org',
- ]
-
openstack_project::cacti_device { $cacti_hosts: }
}