Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216658
Change subject: ocg: switch to ganglia_new
......................................................................
ocg: switch to ganglia_new
Change-Id: I26226ed090cbe54668f20e5f646440674502fab4
---
M hieradata/common.yaml
D hieradata/hosts/ocg1001.yaml
M hieradata/regex.yaml
M manifests/site.pp
4 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/216658/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 29cf36a..09f127b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -72,8 +72,7 @@
name: "PDF servers"
id: 15
sites:
- eqiad:
- - ocg1001.eqiad.wmnet
+ eqiad: []
cache_text:
name: "Text caches"
id: 20
diff --git a/hieradata/hosts/ocg1001.yaml b/hieradata/hosts/ocg1001.yaml
deleted file mode 100644
index 05611d9..0000000
--- a/hieradata/hosts/ocg1001.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ganglia_aggregator: true
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index ad28ad4..3e9fb0e 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -22,6 +22,10 @@
__regex: !ruby/regexp /^etcd100\d\.eqiad\.wmnet$/
ganglia_class: "new"
+etcd:
+ __regex: !ruby/regexp /^ocg100\d\.eqiad\.wmnet$/
+ ganglia_class: "new"
+
cassandra_test:
__regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/
cassandra::seeds:
diff --git a/manifests/site.pp b/manifests/site.pp
index b56d30d..0542349 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2072,7 +2072,6 @@
}
node /^ocg100[123]\.eqiad\.wmnet$/ {
- $ganglia_aggregator = hiera('ganglia_aggregator', false)
role ocg
}
--
To view, visit https://gerrit.wikimedia.org/r/216658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26226ed090cbe54668f20e5f646440674502fab4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
