Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223709
Change subject: Revert "ulsfo mobile caches: switch to ganglia_new"
......................................................................
Revert "ulsfo mobile caches: switch to ganglia_new"
This reverts commit 27f8b5a638da5a931c2b4ea4dae018b6fea0f5bc.
Change-Id: I54bdfbcf911a65924298857b1d1b4ea021dec20b
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/223709/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 750c257..5df2794 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -109,7 +109,9 @@
sites:
eqiad: []
esams: []
- ulsfo: []
+ ulsfo:
+ - cp4011.ulsfo.wmnet
+ - cp4019.ulsfo.wmnet
virt:
name: "Virtualization cluster"
id: 29
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 8cfbd98..cd9bd73 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -22,10 +22,6 @@
__regex: !ruby/regexp
/^(db10[0-9][0-9]|dbstore100[1-2]|dbproxy100[1-4]|es10[0-1][1-9]|labsdb100[1-4]|pc100[1-3])\.eqiad\.wmnet$/
cluster: mysql
-ulsfo_mobile_caches:
- __regex: !ruby/regexp /^cp40(1[129]|20)\.ulsfo\.wmnet$/
- ganglia_class: "new"
-
virtualization:
__regex: !ruby/regexp /^(labnet|labvirt|virt)100[1-9]\.eqiad\.wmnet$/
cluster: "virt"
diff --git a/manifests/site.pp b/manifests/site.pp
index 3e16608..5be9eaa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -504,7 +504,9 @@
}
node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ {
-
+ if $::hostname =~ /^cp401[19]$/ {
+ $ganglia_aggregator = true
+ }
interface::add_ip6_mapped { 'main': }
role cache::mobile
}
--
To view, visit https://gerrit.wikimedia.org/r/223709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bdfbcf911a65924298857b1d1b4ea021dec20b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
