[MediaWiki-commits] [Gerrit] adding virt0 and virt1000 as ganglia agregators - change (operations/puppet)

[Pyoungmeister (Code Review)]

Pyoungmeister has submitted this change and it was merged.

Change subject: adding virt0 and virt1000 as ganglia agregators
......................................................................


adding virt0 and virt1000 as ganglia agregators

Change-Id: I96a12b6a29dc4da59a891a8328e43378abddaf7c
---
M manifests/ganglia.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Pyoungmeister: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index a10138f..b36d5da 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -307,8 +307,8 @@
                                                "SSL cluster" => 
"ssl1.wikimedia.org ssl2.wikimedia.org",
                                                "SSL cluster esams" => 
"hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org 
ssl3002.esams.wikimedia.org",
                                                "Swift pmtpa" => 
"ms-fe1.pmtpa.wmnet ms-fe2.pmtpa.wmnet",
-                                               "Virtualization cluster eqiad" 
=> "virt1005.eqiad.wmnet virt1007.eqiad.wmnet",
-                                               "Virtualization cluster pmtpa" 
=> "virt5.pmtpa.wmnet virt6.pmtpa.wmnet",
+                                               "Virtualization cluster eqiad" 
=> "virt1005.eqiad.wmnet virt1000.wikimedia.org",
+                                               "Virtualization cluster pmtpa" 
=> "virt5.pmtpa.wmnet virt0.wikimedia.org",
                                                "Glusterfs cluster pmtpa" => 
"labstore1.pmtpa.wmnet labstore2.pmtpa.wmnet",
                                                "MySQL eqiad" => 
"db1017.eqiad.wmnet db1021.eqiad.wmnet",
                                                "LVS loadbalancers eqiad" => 
"lvs1001.wikimedia.org lvs1002.wikimedia.org",
diff --git a/manifests/site.pp b/manifests/site.pp
index 4a86d1b..2ff4826 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2803,6 +2803,7 @@
 
 node "virt1000.wikimedia.org" {
        $cluster = "virt"
+       $ganglia_aggregator = true
        $is_puppet_master = "true"
        $is_labs_puppet_master = "true"
        $openstack_version = "folsom"
@@ -2816,6 +2817,7 @@
 
 node "virt0.wikimedia.org" {
        $cluster = "virt"
+       $ganglia_aggregator = true
 
        $is_puppet_master = "true"
        $is_labs_puppet_master = "true"
@@ -2843,7 +2845,7 @@
 
 node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {
        $cluster = "virt"
-       if $hostname =~ /^virt[56]$/ {
+       if $hostname =~ /^virt5$/ {
 
                $ganglia_aggregator = true
        }
@@ -2856,7 +2858,7 @@
 
 node /virt100(5|7|8).eqiad.wmnet/ {
        $cluster = "virt"
-       if $hostname =~ /^virt100[57]$/ {
+       if $hostname =~ /^virt1005$/ {
                $ganglia_aggregator = true
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/74081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I96a12b6a29dc4da59a891a8328e43378abddaf7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits