[MediaWiki-commits] [Gerrit] enabling virt1005 and virt1007 as ganglia aggregators - change (operations/puppet)

2013-07-16 Thread Pyoungmeister (Code Review) 
Pyoungmeister has submitted this change and it was merged.

Change subject: enabling virt1005 and virt1007 as ganglia aggregators
..


enabling virt1005 and virt1007 as ganglia aggregators

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

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



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 5600c96..a10138f 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -307,6 +307,7 @@
"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",
"Glusterfs cluster pmtpa" => 
"labstore1.pmtpa.wmnet labstore2.pmtpa.wmnet",
"MySQL eqiad" => 
"db1017.eqiad.wmnet db1021.eqiad.wmnet",
diff --git a/manifests/site.pp b/manifests/site.pp
index 418b5e9..4a86d1b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2855,10 +2855,10 @@
 }
 
 node /virt100(5|7|8).eqiad.wmnet/ {
-   #$cluster = "virt"
-   #if $hostname =~ /^virt100[57]$/ {
-   #   $ganglia_aggregator = true
-   #}
+   $cluster = "virt"
+   if $hostname =~ /^virt100[57]$/ {
+   $ganglia_aggregator = true
+   }
 
include standard
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dc57509b1458bfbd8200133c8a0728efbe42cc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister 
Gerrit-Reviewer: Pyoungmeister 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] enabling virt1005 and virt1007 as ganglia aggregators - change (operations/puppet)

2013-07-16 Thread Pyoungmeister (Code Review) 
Pyoungmeister has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/73992


Change subject: enabling virt1005 and virt1007 as ganglia aggregators
..

enabling virt1005 and virt1007 as ganglia aggregators

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/73992/1

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 5600c96..a10138f 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -307,6 +307,7 @@
"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",
"Glusterfs cluster pmtpa" => 
"labstore1.pmtpa.wmnet labstore2.pmtpa.wmnet",
"MySQL eqiad" => 
"db1017.eqiad.wmnet db1021.eqiad.wmnet",
diff --git a/manifests/site.pp b/manifests/site.pp
index 418b5e9..4a86d1b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2855,10 +2855,10 @@
 }
 
 node /virt100(5|7|8).eqiad.wmnet/ {
-   #$cluster = "virt"
-   #if $hostname =~ /^virt100[57]$/ {
-   #   $ganglia_aggregator = true
-   #}
+   $cluster = "virt"
+   if $hostname =~ /^virt100[57]$/ {
+   $ganglia_aggregator = true
+   }
 
include standard
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc57509b1458bfbd8200133c8a0728efbe42cc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister 

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