[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: move bast3001 to the other bastions

2016-10-17 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: site.pp: move bast3001 to the other bastions
..


site.pp: move bast3001 to the other bastions

Change-Id: I04c997b56b27db8e3ed3e3b2df08623d95b4988a
---
M manifests/site.pp
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index c190bd6..ebaf446 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -183,6 +183,18 @@
 role(bastionhost::general)
 }
 
+# Bastion in the Netherlands
+node 'bast3001.wikimedia.org' {
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
+role(bastionhost::general, installserver::tftp_server)
+
+class { 'ganglia::monitor::aggregator':
+sites =>  'esams',
+}
+}
+
 # Bastion in California
 node 'bast4001.wikimedia.org' {
 interface::add_ip6_mapped { 'main':
@@ -1247,18 +1259,6 @@
 labs::dns_floating_ip_updater)
 include standard
 include base::firewall
-}
-
-# bastion in the Netherlands
-node 'bast3001.wikimedia.org' {
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-role(bastionhost::general, installserver::tftp_server)
-
-class { 'ganglia::monitor::aggregator':
-sites =>  'esams',
-}
 }
 
 # Primary graphite machines

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04c997b56b27db8e3ed3e3b2df08623d95b4988a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: site.pp: move bast3001 to the other bastions

2016-10-14 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: site.pp: move bast3001 to the other bastions
..

site.pp: move bast3001 to the other bastions

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/316034/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 29b008f..f38f9f9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -183,6 +183,18 @@
 role(bastionhost::general)
 }
 
+# Bastion in the Netherlands
+node 'bast3001.wikimedia.org' {
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
+role(bastionhost::general, installserver::tftp_server)
+
+class { 'ganglia::monitor::aggregator':
+sites =>  'esams',
+}
+}
+
 # Bastion in California
 node 'bast4001.wikimedia.org' {
 interface::add_ip6_mapped { 'main':

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

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

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