[MediaWiki-commits] [Gerrit] manutius: remove torrus - change (operations/puppet)

2014-06-11 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: manutius: remove torrus
..


manutius: remove torrus

followup on :https://gerrit.wikimedia.org/r/#/c/108314/

RT #5148

Change-Id: I307c4efd7c9dc8beba3f950c67d409be4b1fcfb2
---
M manifests/site.pp
1 file changed, 0 insertions(+), 57 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index ddbb60a..623521e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1231,67 +1231,10 @@
 }
 
 node 'manutius.wikimedia.org' {
-
-$corerouters = [
-'cr2-pmtpa.wikimedia.org',
-'cr1-esams.wikimedia.org',
-'cr2-knams.wikimedia.org',
-'cr1-eqiad.wikimedia.org',
-'cr2-eqiad.wikimedia.org',
-'cr1-ulsfo.wikimedia.org',
-'cr2-ulsfo.wikimedia.org',
-'mr1-pmtpa.mgmt.pmtpa.wmnet',
-'pfw1-eqiad.wikimedia.org'
-]
-
-$accessswitches = [
-'asw-d-pmtpa.mgmt.pmtpa.wmnet',
-'asw-a-eqiad.mgmt.eqiad.wmnet',
-'asw-b-eqiad.mgmt.eqiad.wmnet',
-'asw-c-eqiad.mgmt.eqiad.wmnet',
-'asw-d-eqiad.mgmt.eqiad.wmnet',
-'asw2-a5-eqiad.mgmt.eqiad.wmnet',
-'csw2-esams.wikimedia.org',
-'psw1-eqiad.mgmt.eqiad.wmnet',
-'msw1-eqiad.mgmt.eqiad.wmnet',
-'msw2-pmtpa.mgmt.pmtpa.wmnet',
-]
-
-$storagehosts = [
-'nas1-a.pmtpa.wmnet',
-'nas1-b.pmtpa.wmnet',
-'nas1001-a.eqiad.wmnet',
-'nas1001-b.eqiad.wmnet'
-]
-
 include admin
 include standard
 include webserver::apache
-include misc::torrus
-include misc::torrus::web
-include misc::torrus::xml-generation::cdn
 include ganglia::collector
-include passwords::network
-
-$snmp_ro_community = $passwords::network::snmp_ro_community
-
-misc::torrus::discovery::ddxfile { 'corerouters':
-subtree= '/Core_routers',
-snmp_community = $snmp_ro_community,
-hosts  = $corerouters,
-}
-
-misc::torrus::discovery::ddxfile { 'accessswitches':
-subtree= '/Access_switches',
-snmp_community = $snmp_ro_community,
-hosts  = $accessswitches,
-}
-
-misc::torrus::discovery::ddxfile { 'storage':
-subtree= '/Storage',
-snmp_community = $snmp_ro_community,
-hosts  = $storagehosts,
-}
 
 class { 'ganglia_new::monitor::aggregator':
 sites = ['pmtpa', 'eqiad'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I307c4efd7c9dc8beba3f950c67d409be4b1fcfb2
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] manutius: remove torrus - change (operations/puppet)

2014-04-30 Thread Matanya (Code Review) 
Matanya has uploaded a new change for review.

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

Change subject: manutius: remove torrus
..

manutius: remove torrus

Change-Id: I307c4efd7c9dc8beba3f950c67d409be4b1fcfb2
---
M manifests/site.pp
1 file changed, 0 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/130587/1

diff --git a/manifests/site.pp b/manifests/site.pp
index bda08ef..9ccfc0c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1098,65 +1098,9 @@
 }
 
 node 'manutius.wikimedia.org' {
-$corerouters = [
-'cr2-pmtpa.wikimedia.org',
-'cr1-esams.wikimedia.org',
-'cr2-knams.wikimedia.org',
-'csw2-esams.wikimedia.org',
-'cr1-eqiad.wikimedia.org',
-'cr2-eqiad.wikimedia.org',
-'cr1-ulsfo.wikimedia.org',
-'cr2-ulsfo.wikimedia.org',
-'mr1-pmtpa.mgmt.pmtpa.wmnet',
-'pfw1-eqiad.wikimedia.org'
-]
-
-$accessswitches = [
-'asw-d-pmtpa.mgmt.pmtpa.wmnet',
-'asw-a-eqiad.mgmt.eqiad.wmnet',
-'asw-b-eqiad.mgmt.eqiad.wmnet',
-'asw-c-eqiad.mgmt.eqiad.wmnet',
-'asw-d-eqiad.mgmt.eqiad.wmnet',
-'asw2-a5-eqiad.mgmt.eqiad.wmnet',
-'psw1-eqiad.mgmt.eqiad.wmnet',
-'msw1-eqiad.mgmt.eqiad.wmnet',
-'msw2-pmtpa.mgmt.pmtpa.wmnet',
-]
-
-$storagehosts = [
-'nas1-a.pmtpa.wmnet',
-'nas1-b.pmtpa.wmnet',
-'nas1001-a.eqiad.wmnet',
-'nas1001-b.eqiad.wmnet'
-]
-
 include standard
 include webserver::apache
-include misc::torrus
-include misc::torrus::web
-include misc::torrus::xml-generation::cdn
 include ganglia::collector
-include passwords::network
-
-$snmp_ro_community = $passwords::network::snmp_ro_community
-
-misc::torrus::discovery::ddxfile { 'corerouters':
-subtree= '/Core_routers',
-snmp_community = $snmp_ro_community,
-hosts  = $corerouters,
-}
-
-misc::torrus::discovery::ddxfile { 'accessswitches':
-subtree= '/Access_switches',
-snmp_community = $snmp_ro_community,
-hosts  = $accessswitches,
-}
-
-misc::torrus::discovery::ddxfile { 'storage':
-subtree= '/Storage',
-snmp_community = $snmp_ro_community,
-hosts  = $storagehosts,
-}
 
 class { 'ganglia_new::monitor::aggregator':
 sites = ['pmtpa', 'eqiad'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I307c4efd7c9dc8beba3f950c67d409be4b1fcfb2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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