from:"Lcarr \(Code Review\)"

[MediaWiki-commits] [Gerrit] adding labnet1001-ext - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding labnet1001-ext
..


adding labnet1001-ext

Change-Id: I8171431960e8f31190398c2f24fd542c4c3650bf
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 38571cb..32ab290 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1485,6 +1485,7 @@
 1  1H IN PTR   vrrp-gw-1122.eqiad.wmnet.
 2  1H IN PTR   ae2-1122.cr1-eqiad.wikimedia.org.
 3  1H IN PTR   ae2-1122.cr2-eqiad.wikimedia.org.
+11 1H IN PTR   labnet1001-ext.eqiad.wmnet.
 
 ; 10.64.32.0/22 - private1-c-eqiad
 $ORIGIN 32.64.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index f7a547c..aacd2ec 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -901,6 +901,7 @@
 fluorine   1H  IN A10.64.0.21
 helium 1H  IN A10.64.0.179
 labnet1001  1H  IN A10.64.20.13
+labnet1001-ext 1H  IN A10.64.22.11
 labsdb1001  1H  IN A10.64.20.12
 labsdb1002  1H  IN A10.64.37.4
 labsdb1003 1H  IN A10.64.37.5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8171431960e8f31190398c2f24fd542c4c3650bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] adding ipv6 labs subnets - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding ipv6 labs subnets
..


adding ipv6 labs subnets

Change-Id: If9a9cfaa5a3a1dfb99c302a7c2f62fe065d72ef7
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index ca09684..36724d2 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -140,7 +140,17 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1022.cr2-eqiad.wikimedia.org.
 2.2.1.0.6.3.0.0.4.6.0.0.0.1.0.0 1H IN PTR   analytics1022.eqiad.wmnet.
 
+; labs-hosts1-b-eqiad (2620:0:861:118::/64)
+$ORIGIN 8.1.1.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1118.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1118.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1118.cr2-eqiad.wikimedia.org.
 
+; labsexternal1-b-eqiad (2620:0:861:122::/64)
+$ORIGIN 2.2.1.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1122.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1122.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1122.cr2-eqiad.wikimedia.org.
 
 ; LVS Service IPs, 2620:0:861:ed1a::/64
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9a9cfaa5a3a1dfb99c302a7c2f62fe065d72ef7
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] adding labnet1001-ext - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: adding labnet1001-ext
..

adding labnet1001-ext

Change-Id: I8171431960e8f31190398c2f24fd542c4c3650bf
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/35/111235/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 38571cb..32ab290 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1485,6 +1485,7 @@
 1  1H IN PTR   vrrp-gw-1122.eqiad.wmnet.
 2  1H IN PTR   ae2-1122.cr1-eqiad.wikimedia.org.
 3  1H IN PTR   ae2-1122.cr2-eqiad.wikimedia.org.
+11 1H IN PTR   labnet1001-ext.eqiad.wmnet.
 
 ; 10.64.32.0/22 - private1-c-eqiad
 $ORIGIN 32.64.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index f7a547c..aacd2ec 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -901,6 +901,7 @@
 fluorine   1H  IN A10.64.0.21
 helium 1H  IN A10.64.0.179
 labnet1001  1H  IN A10.64.20.13
+labnet1001-ext 1H  IN A10.64.22.11
 labsdb1001  1H  IN A10.64.20.12
 labsdb1002  1H  IN A10.64.37.4
 labsdb1003 1H  IN A10.64.37.5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8171431960e8f31190398c2f24fd542c4c3650bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding ipv6 labs subnets - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: adding ipv6 labs subnets
..

adding ipv6 labs subnets

Change-Id: If9a9cfaa5a3a1dfb99c302a7c2f62fe065d72ef7
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/34/111234/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index ca09684..36724d2 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -140,7 +140,17 @@
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1022.cr2-eqiad.wikimedia.org.
 2.2.1.0.6.3.0.0.4.6.0.0.0.1.0.0 1H IN PTR   analytics1022.eqiad.wmnet.
 
+; labs-hosts1-b-eqiad (2620:0:861:118::/64)
+$ORIGIN 8.1.1.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1118.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1118.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1118.cr2-eqiad.wikimedia.org.
 
+; labsexternal1-b-eqiad (2620:0:861:122::/64)
+$ORIGIN 2.2.1.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1122.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1122.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae3-1122.cr2-eqiad.wikimedia.org.
 
 ; LVS Service IPs, 2620:0:861:ed1a::/64
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9a9cfaa5a3a1dfb99c302a7c2f62fe065d72ef7
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding a new vlan for network nodes - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding a new vlan for network nodes
..


adding a new vlan for network nodes

Change-Id: If562ff438ef132805eeaf61db9305f35c1683fd7
---
M templates/10.in-addr.arpa
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index cf63a9f..38571cb 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1473,12 +1473,19 @@
 
 1  1H IN PTR   vrrp-gw-1021.eqiad.wmnet.
 2  1H IN PTR   ae2-1021.cr1-eqiad.wikimedia.org.
-3  1H IN PTR   ae2-1021.cr2.eqiad.wikimedia.org.
+3  1H IN PTR   ae2-1021.cr2-eqiad.wikimedia.org.
 ;107   1H IN PTR   analytics1007.eqiad.wmnet.
 
 1101H IN PTR   analytics1010.eqiad.wmnet.
 1231H IN PTR   vanadium.eqiad.wmnet.
 
+; 10.64.22.0/24 - labsexternal1-b-eqiad
+$ORIGIN 22.64.{{ zonename }}.
+
+1  1H IN PTR   vrrp-gw-1122.eqiad.wmnet.
+2  1H IN PTR   ae2-1122.cr1-eqiad.wikimedia.org.
+3  1H IN PTR   ae2-1122.cr2-eqiad.wikimedia.org.
+
 ; 10.64.32.0/22 - private1-c-eqiad
 $ORIGIN 32.64.{{ zonename }}.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If562ff438ef132805eeaf61db9305f35c1683fd7
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] adding a new vlan for network nodes - change (operations/dns)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: adding a new vlan for network nodes
..

adding a new vlan for network nodes

Change-Id: If562ff438ef132805eeaf61db9305f35c1683fd7
---
M templates/10.in-addr.arpa
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/23/111223/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index cf63a9f..c5a1933 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1479,6 +1479,13 @@
 1101H IN PTR   analytics1010.eqiad.wmnet.
 1231H IN PTR   vanadium.eqiad.wmnet.
 
+; 10.64.22.0/24 - labsexternal1-b-eqiad
+$ORIGIN 22.64.{{ zonename }}.
+
+1  1H IN PTR   vrrp-gw-1122.eqiad.wmnet.
+2  1H IN PTR   ae2-1122.cr1-eqiad.wikimedia.org.
+3  1H IN PTR   ae2-1122.cr2.eqiad.wikimedia.org.
+
 ; 10.64.32.0/22 - private1-c-eqiad
 $ORIGIN 32.64.{{ zonename }}.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If562ff438ef132805eeaf61db9305f35c1683fd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] labnet1001 interface addressing adding external interface + ... - change (operations/puppet)

2014-02-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: labnet1001 interface addressing adding external interface + 
removing unneeded site selector
..

labnet1001 interface addressing
adding external interface + removing unneeded site selector

Change-Id: Ic09379e2f3f8de1cf8722f72b353808c1071335c
---
M manifests/role/neutron.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/111219/1

diff --git a/manifests/role/neutron.pp b/manifests/role/neutron.pp
index 7d1e993..4294dea 100644
--- a/manifests/role/neutron.pp
+++ b/manifests/role/neutron.pp
@@ -51,7 +51,9 @@
 }
 
 if ($::site == 'eqiad') {
-interface::ip { 'openstack::network_service_public_dynamic_snat': 
interface => 'lo', address => $site ? { 'pmtpa' => '208.80.153.192', 'eqiad' => 
'208.80.155.255' } }
+interface::ip { 'openstack::network_service_public_dynamic_snat': 
interface => 'lo', address => '208.80.155.255' }
+
+interface::ip { 'openstack::external_interface': interface => 'br-ex', 
address => '10.64.20.13', prefixlen => '24' }
 
 interface::tagged { 'eth1.1102':
 base_interface => 'eth1',

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

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

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

[MediaWiki-commits] [Gerrit] fixing typo - taged to tagged - change (operations/puppet)

2014-01-29 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fixing typo - taged to tagged
..


fixing typo - taged to tagged

Change-Id: I192e6d8f9a0962fc46fb708c969f361d0ed97ff0
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Lcarr: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index ba568b5..fa2c419 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -323,7 +323,7 @@
 
interface::ip { 
"openstack::network_service_public_dynamic_snat": interface => "lo", address => 
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
 
-   interface::taged { "bond1.1102":
+   interface::tagged { "bond1.1102":
base_interface => "bond1",
vlan_id=> "1102",
method => "manual",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I192e6d8f9a0962fc46fb708c969f361d0ed97ff0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] fixing typo - taged to tagged - change (operations/puppet)

2014-01-29 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: fixing typo - taged to tagged
..

fixing typo - taged to tagged

Change-Id: I192e6d8f9a0962fc46fb708c969f361d0ed97ff0
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/110207/1

diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index ba568b5..fa2c419 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -323,7 +323,7 @@
 
interface::ip { 
"openstack::network_service_public_dynamic_snat": interface => "lo", address => 
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
 
-   interface::taged { "bond1.1102":
+   interface::tagged { "bond1.1102":
base_interface => "bond1",
vlan_id=> "1102",
method => "manual",

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

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

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

[MediaWiki-commits] [Gerrit] Creating network config for eqiad nova network controller - change (operations/puppet)

2014-01-29 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Creating network config for eqiad nova network controller
..


Creating network config for eqiad nova network controller

Change-Id: Ie866684b926eb7f13d6771c95bc094ec911ce5a7
---
M manifests/role/nova.pp
1 file changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index e6277da..ba568b5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -318,6 +318,20 @@
}
}
 
+   if ($::site == "eqiad") {
+   require role::nova::network::bonding
+
+   interface::ip { 
"openstack::network_service_public_dynamic_snat": interface => "lo", address => 
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
+
+   interface::taged { "bond1.1102":
+   base_interface => "bond1",
+   vlan_id=> "1102",
+   method => "manual",
+   up => 'ip link set $IFACE up',
+   down   => 'ip link set $IFACE down',
+   }
+   }
+
class { "openstack::network-service": openstack_version => 
$openstack_version, novaconfig => $novaconfig }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie866684b926eb7f13d6771c95bc094ec911ce5a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Creating network config for eqiad nova network controller - change (operations/puppet)

2014-01-29 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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

Change subject: Creating network config for eqiad nova network controller
..

Creating network config for eqiad nova network controller

Change-Id: Ie866684b926eb7f13d6771c95bc094ec911ce5a7
---
M manifests/role/nova.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/110206/1

diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index e6277da..ba568b5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -318,6 +318,20 @@
}
}
 
+   if ($::site == "eqiad") {
+   require role::nova::network::bonding
+
+   interface::ip { 
"openstack::network_service_public_dynamic_snat": interface => "lo", address => 
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
+
+   interface::taged { "bond1.1102":
+   base_interface => "bond1",
+   vlan_id=> "1102",
+   method => "manual",
+   up => 'ip link set $IFACE up',
+   down   => 'ip link set $IFACE down',
+   }
+   }
+
class { "openstack::network-service": openstack_version => 
$openstack_version, novaconfig => $novaconfig }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] adding in rdns for new link between eqiad and ulsfo - change (operations/dns)

2014-01-16 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding in rdns for new link between eqiad and ulsfo
..


adding in rdns for new link between eqiad and ulsfo

Change-Id: I925bade6e9fca634610a4533f1d1368be399516e
---
M templates/155.80.208.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index 59a580e..eaed4fe 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -43,6 +43,11 @@
 36 1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37 1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
+;208.80.155.38/31 cr2-ulsfo <-> cr1-eqiad
+
+38 1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
+39 1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
+
 ;208.80.155.64/26 Sandbox subnet
 ;208.80.155.64/28 Sandbox1-b-eqiad subnet
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 28fc73d..1574115 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -65,6 +65,12 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr2-ulsfo.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br2-ulsfo.wikimedia.org.
 
+; cr2-ulsfo <--> cr1-eqiad (2620:0:863:fe04::/64)
+
+$ORIGIN 4.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  
xe-4-2-1.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  
xe-1-2-0.cr2-ulsfo.wikimedia.org.
+
 ; Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I925bade6e9fca634610a4533f1d1368be399516e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding in rdns for new link between eqiad and ulsfo - change (operations/dns)

2014-01-16 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding in rdns for new link between eqiad and ulsfo
..

adding in rdns for new link between eqiad and ulsfo

Change-Id: I925bade6e9fca634610a4533f1d1368be399516e
---
M templates/155.80.208.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/80/107980/1

diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index 59a580e..eaed4fe 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -43,6 +43,11 @@
 36 1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37 1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
+;208.80.155.38/31 cr2-ulsfo <-> cr1-eqiad
+
+38 1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
+39 1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
+
 ;208.80.155.64/26 Sandbox subnet
 ;208.80.155.64/28 Sandbox1-b-eqiad subnet
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 28fc73d..1574115 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -65,6 +65,12 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr2-ulsfo.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br2-ulsfo.wikimedia.org.
 
+; cr2-ulsfo <--> cr1-eqiad (2620:0:863:fe04::/64)
+
+$ORIGIN 4.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  
xe-4-2-1.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  
xe-1-2-0.cr2-ulsfo.wikimedia.org.
+
 ; Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I925bade6e9fca634610a4533f1d1368be399516e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] dport is important - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: dport is important
..


dport is important

Change-Id: I1087b57af751beb803241edb9b94e6c7377cb9f2
---
M modules/ferm/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 7924970..d8b4259 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -57,6 +57,6 @@
 #allow udp dpt 123
 
 ferm::rule { 'allow_ntp':
-rule => 'proto udp port 123 ACCEPT;'
+rule => 'proto udp dport 123 ACCEPT;'
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] dport is important - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: dport is important
..

dport is important

Change-Id: I1087b57af751beb803241edb9b94e6c7377cb9f2
---
M modules/ferm/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 7924970..d8b4259 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -57,6 +57,6 @@
 #allow udp dpt 123
 
 ferm::rule { 'allow_ntp':
-rule => 'proto udp port 123 ACCEPT;'
+rule => 'proto udp dport 123 ACCEPT;'
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] allow udp by default with ferm - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: allow udp by default with ferm
..

allow udp by default with ferm

Change-Id: Ifa99655e5a4de612af95dea762cd863808ae0c21
---
M modules/ferm/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/107532/1

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 75b4450..7924970 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -53,4 +53,10 @@
 # the rules are virtual resources for cases where they are defined in a
 # class but the host doesn't have the ferm class included
 File <| tag == 'ferm' |>
+
+#allow udp dpt 123
+
+ferm::rule { 'allow_ntp':
+rule => 'proto udp port 123 ACCEPT;'
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Adding in semicolon for proper ferm syntax - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Adding in semicolon for proper ferm syntax
..


Adding in semicolon for proper ferm syntax

Change-Id: I974f9a45d855cfcd2a09f0496aac4dc3fb943a10
---
M modules/pmacct/manifests/makeconfig.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/pmacct/manifests/makeconfig.pp 
b/modules/pmacct/manifests/makeconfig.pp
index 3301b25..65a207e 100644
--- a/modules/pmacct/manifests/makeconfig.pp
+++ b/modules/pmacct/manifests/makeconfig.pp
@@ -14,7 +14,7 @@
 
 # Corresponding ferm rule for firewall redirect
 ferm::rule {"${name}-BGP":
-rule  => "proto tcp dport 179 source ${ip} REDIRECT to-ports ${port}",
+rule  => "proto tcp dport 179 source ${ip} REDIRECT to-ports ${port};",
 table => 'nat',
 chain => 'PREROUTING',
 }

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

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

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

[MediaWiki-commits] [Gerrit] Adding in semicolon for proper ferm syntax - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: Adding in semicolon for proper ferm syntax
..

Adding in semicolon for proper ferm syntax

Change-Id: I974f9a45d855cfcd2a09f0496aac4dc3fb943a10
---
M modules/pmacct/manifests/makeconfig.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/107516/1

diff --git a/modules/pmacct/manifests/makeconfig.pp 
b/modules/pmacct/manifests/makeconfig.pp
index 3301b25..65a207e 100644
--- a/modules/pmacct/manifests/makeconfig.pp
+++ b/modules/pmacct/manifests/makeconfig.pp
@@ -14,7 +14,7 @@
 
 # Corresponding ferm rule for firewall redirect
 ferm::rule {"${name}-BGP":
-rule  => "proto tcp dport 179 source ${ip} REDIRECT to-ports ${port}",
+rule  => "proto tcp dport 179 source ${ip} REDIRECT to-ports ${port};",
 table => 'nat',
 chain => 'PREROUTING',
 }

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

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

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

[MediaWiki-commits] [Gerrit] requiring ferm winds up making cyclical dependancy - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: requiring ferm winds up making cyclical dependancy
..


requiring ferm winds up making cyclical dependancy

Change-Id: Icf96bf155719abf6c04246ca590ea21de320b728
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index 1a8c340..023b834 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -13,7 +13,7 @@
 group   => root,
 mode=> '0400',
 content => template('ferm/rule.erb'),
-require => [ File['/etc/ferm/conf.d'], Class['ferm'] ],
+require => File['/etc/ferm/conf.d'],
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

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

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

[MediaWiki-commits] [Gerrit] requiring ferm winds up making cyclical dependancy - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: requiring ferm winds up making cyclical dependancy
..

requiring ferm winds up making cyclical dependancy

Change-Id: Icf96bf155719abf6c04246ca590ea21de320b728
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/107515/1

diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index 1a8c340..023b834 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -13,7 +13,7 @@
 group   => root,
 mode=> '0400',
 content => template('ferm/rule.erb'),
-require => [ File['/etc/ferm/conf.d'], Class['ferm'] ],
+require => File['/etc/ferm/conf.d'],
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

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

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

[MediaWiki-commits] [Gerrit] including class ferm (to make ferm rules work) - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: including class ferm (to make ferm rules work)
..


including class ferm (to make ferm rules work)

Change-Id: If78a3d20c9fe5e544439ace71f706bda0a371c2f
---
M manifests/site.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index e7f015a..6d790f5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1888,7 +1888,8 @@
 smokeping::web,
 role::librenms,
geoip,
-   pmacct
+   pmacct,
+   ferm
 
 interface::add_ip6_mapped { "main": }
 }

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

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

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

[MediaWiki-commits] [Gerrit] including class ferm (to make ferm rules work) - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: including class ferm (to make ferm rules work)
..

including class ferm (to make ferm rules work)

Change-Id: If78a3d20c9fe5e544439ace71f706bda0a371c2f
---
M manifests/site.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/107512/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e7f015a..6d790f5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1888,7 +1888,8 @@
 smokeping::web,
 role::librenms,
geoip,
-   pmacct
+   pmacct,
+   ferm
 
 interface::add_ip6_mapped { "main": }
 }

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

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

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

[MediaWiki-commits] [Gerrit] cannot have two require statements - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: cannot have two require statements
..


cannot have two require statements

Change-Id: I2ef908df978c86437fae062d38bff5327aeaf62a
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index f49d1e4..1a8c340 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -13,8 +13,7 @@
 group   => root,
 mode=> '0400',
 content => template('ferm/rule.erb'),
-require => File['/etc/ferm/conf.d'],
-require => Class['ferm'],
+require => [ File['/etc/ferm/conf.d'], Class['ferm'] ],
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ef908df978c86437fae062d38bff5327aeaf62a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] cannot have two require statements - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: cannot have two require statements
..

cannot have two require statements

Change-Id: I2ef908df978c86437fae062d38bff5327aeaf62a
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/107510/1

diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index f49d1e4..0955e65 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -13,8 +13,7 @@
 group   => root,
 mode=> '0400',
 content => template('ferm/rule.erb'),
-require => File['/etc/ferm/conf.d'],
-require => Class['ferm'],
+require => { File['/etc/ferm/conf.d'], Class['ferm'] },
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

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

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

[MediaWiki-commits] [Gerrit] requiring ferm class if ferm rule is called - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: requiring ferm class if ferm rule is called
..


requiring ferm class if ferm rule is called

Change-Id: I77b359f3599a92e47d752c24b6e90094a2557a0c
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index 023b834..f49d1e4 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -14,6 +14,7 @@
 mode=> '0400',
 content => template('ferm/rule.erb'),
 require => File['/etc/ferm/conf.d'],
+require => Class['ferm'],
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

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

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

[MediaWiki-commits] [Gerrit] requiring ferm class if ferm rule is called - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: requiring ferm class if ferm rule is called
..

requiring ferm class if ferm rule is called

Change-Id: I77b359f3599a92e47d752c24b6e90094a2557a0c
---
M modules/ferm/manifests/rule.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/107509/1

diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index 023b834..f49d1e4 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -14,6 +14,7 @@
 mode=> '0400',
 content => template('ferm/rule.erb'),
 require => File['/etc/ferm/conf.d'],
+require => Class['ferm'],
 notify  => Service['ferm'],
 tag => 'ferm',
 }

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

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

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

[MediaWiki-commits] [Gerrit] Applying pmacct to netmon1001 - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Applying pmacct to netmon1001
..


Applying pmacct to netmon1001

Change-Id: I623f8966b7e5e895051efc00e398974822c8a2bf
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 12fce78..e7f015a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1886,7 +1886,9 @@
 misc::rancid,
 smokeping,
 smokeping::web,
-role::librenms
+role::librenms,
+   geoip,
+   pmacct
 
 interface::add_ip6_mapped { "main": }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Applying pmacct to netmon1001 - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: Applying pmacct to netmon1001
..

Applying pmacct to netmon1001

Change-Id: I623f8966b7e5e895051efc00e398974822c8a2bf
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/107507/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 12fce78..e7f015a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1886,7 +1886,9 @@
 misc::rancid,
 smokeping,
 smokeping::web,
-role::librenms
+role::librenms,
+   geoip,
+   pmacct
 
 interface::add_ip6_mapped { "main": }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Initial commit of pmacct module - change (operations/puppet)

2014-01-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Initial commit of pmacct module
..


Initial commit of pmacct module

Change-Id: I8bb1cfb204d8b7fcf775a549d004edb72f039edf
---
A modules/pmacct/manifests/devices.pp
A modules/pmacct/manifests/init.pp
A modules/pmacct/manifests/makeconfig.pp
A modules/pmacct/templates/config.erb
4 files changed, 218 insertions(+), 0 deletions(-)

Approvals:
  Lcarr: Looks good to me, approved
  Matanya: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/pmacct/manifests/devices.pp 
b/modules/pmacct/manifests/devices.pp
new file mode 100644
index 000..a9f4339
--- /dev/null
+++ b/modules/pmacct/manifests/devices.pp
@@ -0,0 +1,61 @@
+# Class: pmacct
+#
+# List of devices speaking netflow/ipfix
+#
+# IP is needed for iptables rules changes
+# port is needed for flow and bpg config
+# samplerate is to adjust for sampling
+
+class pmacct::devices {
+# Device Listing
+$list = {
+# tpa - as65001
+cr1-sdtpa => {
+port   => '6511',
+ip => '208.80.152.196',
+samplerate => '200',
+},
+# Currently running old JunOS and will not sample correctly
+#cr2-pmtpa => {
+#port   => '6512',
+#ip => '208.80.152.197',
+#samplerate => '1000',
+#},
+
+# eqiad - as65002
+cr1-eqiad => {
+port   => '6521',
+ip => '208.80.154.196',
+samplerate => '1000',
+},
+cr2-eqiad => {
+port   => '6522',
+ip => '208.80.154.197',
+samplerate => '1000',
+},
+
+# ulsfo - as65003
+cr1-ulsfo => {
+port   => '6531',
+ip => '198.35.26.192',
+samplerate => '1000',
+},
+cr2-ulsfo => {
+port   => '6532',
+ip => '198.35.26.193',
+samplerate => '1000',
+},
+
+# ams - as43821
+cr1-esams => {
+port   => '4381',
+ip => '91.198.174.245',
+samplerate => '1000',
+},
+cr2-knams => {
+port   => '4382',
+ip => '91.198.174.246',
+samplerate => '1000',
+},
+}
+}
diff --git a/modules/pmacct/manifests/init.pp b/modules/pmacct/manifests/init.pp
new file mode 100644
index 000..3d1d098
--- /dev/null
+++ b/modules/pmacct/manifests/init.pp
@@ -0,0 +1,73 @@
+# Class: pmacct
+#
+# This installs and mangages pmacct configuraiton
+# http://www.pmacct.net/
+#
+# Will initially be added to node 'netmon1001'
+
+class pmacct {
+
+# Note: $pmacct::home does not work here...  ?
+$home  = '/srv/pmacct'
+
+# mysql
+$mysqlhost = '127.0.0.1'
+$mysqluser = 'pmacct'
+$mysqlpass = $passwords::pmacct::mysqlpass
+
+# Package (have a fresh one built by Faidon)
+# --enable-mysql --enable-64bit --enable-threads --enable-geoip
+# and added to our repo?
+package { 'pmacct':
+ensure => installed,
+}
+
+# User creation (not done by package)
+generic::systemuser { 'pmacct':
+name  => 'pmacct',
+home  => $pmacct::home,
+shell => '/bin/sh',
+}
+
+# Home directory
+file { $pmacct::home:
+ensure => 'directory',
+owner  => 'pmacct',
+group  => 'pmacct',
+mode   => '0750',
+}
+
+# Log directory
+file { "${pmacct::home}/logs":
+ensure  => 'directory',
+owner   => 'pmacct',
+group   => 'pmacct',
+mode=> '0750',
+require => File[ $pmacct::home ],
+}
+
+# Config directory
+file { "${pmacct::home}/configs":
+ensure  => 'directory',
+owner   => 'pmacct',
+group   => 'pmacct',
+mode=> '0750',
+require => File[ $pmacct::home ],
+}
+
+# Device list (nice to keep it in it's own world)
+require 'pmacct::devices'
+
+# Iterate over the device list to create new configs
+# FIXME: Review daniel's different method for iterating over a hash..
+create_resources('pmacct::makeconfig', $pmacct::devices::list)
+
+# Iterate over the device list to verify/check iptables redirects
+# FIXME: ferm (should probably happen in one iterate...
+
+
+# FIXME: make sure services are running (not start/stop scripts)
+# ...
+}
+
+
diff --git a/modules/pmacct/manifests/makeconfig.pp 
b/modules/pmacct/manifests/makeconfig.pp
new file mode 100644
index 000..3301b25
--- /dev/null
+++ b/modules/pmacct/manifests/makeconfig.pp
@@ -0,0 +1,21 @@
+# pmacct::makeconfig
+# Generates a unique config file per device
+
+define pmacct::makeconfig ($name, $port, $ip, $samplerate) {
+# Single confile file per device
+file { "${pmacct::home}/configs/config-$

[MediaWiki-commits] [Gerrit] giving the CORRECT secondary ip to aluminium - rt 6601 - change (operations/puppet)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: giving the CORRECT secondary ip to aluminium - rt 6601
..


giving the CORRECT secondary ip to aluminium - rt 6601

Change-Id: Ibc4016348e77aff0958660a5deec699672de6488
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 321ac49..9d4a468 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -837,7 +837,7 @@
 include role::fundraising::civicrm,
 accounts::file_mover
 class { 'misc::fundraising::backup::archive_sync': hour => [0,8,16], 
minute => 5 }
-interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.152.143" }
+interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.154.12" }
 }
 
 # erbium is a webrequest udp2log host

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc4016348e77aff0958660a5deec699672de6488
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 

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

[MediaWiki-commits] [Gerrit] giving the CORRECT secondary ip to aluminium - rt 6601 - change (operations/puppet)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: giving the CORRECT secondary ip to aluminium - rt 6601
..

giving the CORRECT secondary ip to aluminium - rt 6601

Change-Id: Ibc4016348e77aff0958660a5deec699672de6488
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/106130/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 321ac49..9d4a468 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -837,7 +837,7 @@
 include role::fundraising::civicrm,
 accounts::file_mover
 class { 'misc::fundraising::backup::archive_sync': hour => [0,8,16], 
minute => 5 }
-interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.152.143" }
+interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.154.12" }
 }
 
 # erbium is a webrequest udp2log host

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

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

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

[MediaWiki-commits] [Gerrit] giving secondary ip to aluminum - change (operations/puppet)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: giving secondary ip to aluminum
..


giving secondary ip to aluminum

Change-Id: I5b58631f3dd1e9921d2c12d87b66ff0c3b181c16
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 8dae548..321ac49 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -837,6 +837,7 @@
 include role::fundraising::civicrm,
 accounts::file_mover
 class { 'misc::fundraising::backup::archive_sync': hour => [0,8,16], 
minute => 5 }
+interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.152.143" }
 }
 
 # erbium is a webrequest udp2log host

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

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

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

[MediaWiki-commits] [Gerrit] giving secondary ip to aluminum - change (operations/puppet)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: giving secondary ip to aluminum
..

giving secondary ip to aluminum

Change-Id: I5b58631f3dd1e9921d2c12d87b66ff0c3b181c16
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/106125/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 8dae548..321ac49 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -837,6 +837,7 @@
 include role::fundraising::civicrm,
 accounts::file_mover
 class { 'misc::fundraising::backup::archive_sync': hour => [0,8,16], 
minute => 5 }
+interface::ip { "fundraising.wikimedia.org": interface => "eth0", address 
=> "208.80.152.143" }
 }
 
 # erbium is a webrequest udp2log host

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

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

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

[MediaWiki-commits] [Gerrit] adding secondary IP for aluminium for fundraising.wikimedia.org - change (operations/dns)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding secondary IP for aluminium for fundraising.wikimedia.org
..


adding secondary IP for aluminium for fundraising.wikimedia.org

Change-Id: Id7056e30702301edf6d7e973975880a5b6b087ee
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 2636633..338ea4b 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -26,7 +26,7 @@
 9   1H  IN PTR  ssl1003.wikimedia.org.
 10  1H  IN PTR  carbon.wikimedia.org.
 11  1H  IN PTR  dataset1001.wikimedia.org.
-12  1H  IN PTR  barium.wikimedia.org.
+12  1H  IN PTR  al-fundraising.wikimedia.org.
 
 14  1H  IN PTR  neon.wikimedia.org.
 15  1H  IN PTR  oxygen.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8910f8e..9d738bc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -99,6 +99,7 @@
 
 ; Servers (alphabetic order) << WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND?
 
+al-fundraising 1H  IN A208.80.154.12
 aluminium  1H  IN A208.80.154.6
 aluminum   1H  IN CNAME aluminium
 analytics1003  1H  IN A208.80.154.160

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7056e30702301edf6d7e973975880a5b6b087ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding secondary IP for aluminium for fundraising.wikimedia.org - change (operations/dns)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding secondary IP for aluminium for fundraising.wikimedia.org
..

adding secondary IP for aluminium for fundraising.wikimedia.org

Change-Id: Id7056e30702301edf6d7e973975880a5b6b087ee
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/20/106120/1

diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 2636633..338ea4b 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -26,7 +26,7 @@
 9   1H  IN PTR  ssl1003.wikimedia.org.
 10  1H  IN PTR  carbon.wikimedia.org.
 11  1H  IN PTR  dataset1001.wikimedia.org.
-12  1H  IN PTR  barium.wikimedia.org.
+12  1H  IN PTR  al-fundraising.wikimedia.org.
 
 14  1H  IN PTR  neon.wikimedia.org.
 15  1H  IN PTR  oxygen.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8910f8e..9d738bc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -99,6 +99,7 @@
 
 ; Servers (alphabetic order) << WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND?
 
+al-fundraising 1H  IN A208.80.154.12
 aluminium  1H  IN A208.80.154.6
 aluminum   1H  IN CNAME aluminium
 analytics1003  1H  IN A208.80.154.160

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7056e30702301edf6d7e973975880a5b6b087ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] write a \n at EOF after generating rest of conf - change (operations/apache-config)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: write a \n at EOF after generating rest of conf
..


write a \n at EOF after generating rest of conf

Change-Id: Id36aecf65c3049c7365055ec298890ff289ab5b5
---
M refreshDomainRedirects
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/refreshDomainRedirects b/refreshDomainRedirects
index be350e1..408e2c2 100755
--- a/refreshDomainRedirects
+++ b/refreshDomainRedirects
@@ -431,7 +431,7 @@
 
fwrite( $f, 
"\n" .
-   "# vim" . ": sts=4 sw=4 autoindent syn=apache" );
+   "# vim" . ": sts=4 sw=4 autoindent syn=apache\n" );
fclose( $f );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id36aecf65c3049c7365055ec298890ff289ab5b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Jeremyb 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] fix redirects for percent-encoded destinations - change (operations/apache-config)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fix redirects for percent-encoded destinations
..


fix redirects for percent-encoded destinations

apparently apache was urldecoding and reencoding and garbled on the
way and clients were sent to the wrong destination

first fixed generated conf for 2 entries and tested and they worked

then fixed the php and the new conf for those 2 entries was
identical to what was tested

Change-Id: Ibd3c0e506235487dfe9e7834ae05d4012b9c6c4c
---
M redirects.conf
M refreshDomainRedirects
2 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/redirects.conf b/redirects.conf
index 9cd8bae..5780415 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -443,28 +443,28 @@
# Type: wildcardOverride
# override  *wikipedie.cz/Experti_na_prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} =wikipedie.cz
-   RewriteRule ^/Experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/Experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/Experti_na_prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedie\.cz$
-   RewriteRule ^/Experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/Experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/Experti-na-prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} =wikipedie.cz
-   RewriteRule ^/Experti\-na\-prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/Experti\-na\-prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/Experti-na-prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedie\.cz$
-   RewriteRule ^/Experti\-na\-prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/Experti\-na\-prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/experti_na_prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} =wikipedie.cz
-   RewriteRule ^/experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/experti_na_prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} ^(.+)\.wikipedie\.cz$
-   RewriteRule ^/experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   RewriteRule ^/experti_na_prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr\%C3\%A1n\%C4\%9Bn\%C3\%A1_\%C3\%BAzem\%C3\%AD/Experti_na_p\%C5\%99\%C3\%ADrodu
 [R=301,L,NE]
# override  *wikipedie.cz/experti-na-prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
RewriteCond %{HTTP_HOST} =wikipedie.cz
-   RewriteRule ^/experti\-na\-prirodu$ 
%{ENV:HTTP_X_Forwarded_Proto}://cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chr%C3%A1n%C4%9Bn%C3%A1_%C3%BAzem%C3%AD/Experti_na_p%C5%99%C3%ADrodu
 [R=301,L,NE]
+   Rewri

[MediaWiki-commits] [Gerrit] nrpe: adjust Zuul process monitoring - change (operations/puppet)

2014-01-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: nrpe: adjust Zuul process monitoring
..


nrpe: adjust Zuul process monitoring

With the new Zuul version, it forks a process to run the Gearman server.
The nrpe checks needs to be adjusted to ensure we have exactly TWO pids
running.

Change-Id: I6a05c1b5faa0f9f732f9b6d99a44d0076e35e857
---
M modules/nrpe/templates/nrpe_local.cfg.erb
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb 
b/modules/nrpe/templates/nrpe_local.cfg.erb
index 3f54f7d..2070766 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -14,7 +14,9 @@
 
 # process checks, we can't make this generic because we don't pass args via 
nrpe (security)
 command[check_jenkins]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'
-command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-server'
+# Zuul has a main process and a fork which is the gearman server. Thus we need
+# two process running.
+command[check_zuul]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:2 
--ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-server'
 command[check_mailman]=/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1:35 -a 
mailman
 command[check_spamd]=/usr/lib/nagios/plugins/check_procs -w 1:20 -c 1:40 -a 
spamd
 command[check_poolcounterd]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:3 
-C poolcounterd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a05c1b5faa0f9f732f9b6d99a44d0076e35e857
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] replacing star cert with noc.wikimedia.org on fenari - change (operations/puppet)

2014-01-06 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: replacing star cert with noc.wikimedia.org on fenari
..


replacing star cert with noc.wikimedia.org on fenari

Change-Id: Icd40778adb432dbe368311dbcd25f4678027145e
---
M files/apache/sites/noc.wikimedia.org
M manifests/site.pp
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/files/apache/sites/noc.wikimedia.org 
b/files/apache/sites/noc.wikimedia.org
index fdde89c..86b5ffe 100644
--- a/files/apache/sites/noc.wikimedia.org
+++ b/files/apache/sites/noc.wikimedia.org
@@ -51,8 +51,8 @@
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+   SSLCertificateFile /etc/ssl/certs/noc.wikimedia.org.pem
+   SSLCertificateKeyFile /etc/ssl/private/noc.wikimedia.org.key
 
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
diff --git a/manifests/site.pp b/manifests/site.pp
index 37590c7..fbfb296 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -907,7 +907,7 @@
 generic::wikidev-umask,
 misc::dsh,
 ssh::hostkeys-collect
-install_certificate{ "star.wikimedia.org": }
+install_certificate{ "noc.wikimedia.org": }
 }
 
 node "fluorine.eqiad.wmnet" {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd40778adb432dbe368311dbcd25f4678027145e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] zuul: let us change branch of zuul-config repo - change (operations/puppet)

2014-01-06 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: zuul: let us change branch of zuul-config repo
..


zuul: let us change branch of zuul-config repo

The Zuul configuration is hosted in integration/zuul-config. Since the
production and labs environnements are entirely different, this patch
let us pass the branch of zuul-config we want to initially checkout.

The new parameter being config_git_branch (default: master). For labs
the branch is 'labs'.

Change-Id: Ide5f94ff6d2f75b845246d66a1c6554038bdc1f5
---
M manifests/role/zuul.pp
M manifests/zuul.pp
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 6db8bd7..9423370 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -35,6 +35,7 @@
 gerrit_user  => 'jenkins',
 url_pattern  => 
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
 status_url   => 'http://integration.wmflabs.org/zuul/status',
+config_git_branch=> 'labs',
 git_branch   => 'labs',
 git_dir  => $role::zuul::configuration::zuul_git_dir,
 push_change_refs => false,
@@ -77,6 +78,7 @@
 gerrit_user  => 'jenkins-bot',
 url_pattern  => 
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
 status_url   => 'https://integration.wikimedia.org/zuul/',
+config_git_branch=> 'master',
 git_branch   => 'master',
 git_dir  => $role::zuul::configuration::zuul_git_dir,
 push_change_refs => false,
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index 93c7fba..09b2fef 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -13,6 +13,7 @@
$gerrit_user,
$url_pattern,
$status_url,
+   $config_git_branch='master',
$git_branch='master',
$git_dir='/var/lib/zuul/git',
$push_change_refs,
@@ -56,7 +57,7 @@
group => jenkins,
mode => 0775,
origin => 
"https://gerrit.wikimedia.org/r/p/integration/zuul-config.git";,
-   branch => "master",
+   branch => $config_git_branch,
}
 
# Logging configuration

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide5f94ff6d2f75b845246d66a1c6554038bdc1f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] zuul: support for zuul.zuul_url - change (operations/puppet)

2014-01-06 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: zuul: support for zuul.zuul_url
..


zuul: support for zuul.zuul_url

Upstream has introduced a new mandatory configuration parameter
'zuul_url'. It specifies the URL of the repositories maintained by Zuul
and from which workers should fetch from.

Change-Id: Id1cce4ea87e2b01be12904d328f4bfbf3cb1df04
---
M manifests/role/zuul.pp
M manifests/zuul.pp
M modules/zuul/manifests/init.pp
M modules/zuul/templates/zuul.conf.erb
4 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 9423370..4c49956 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -35,6 +35,7 @@
 gerrit_user  => 'jenkins',
 url_pattern  => 
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
 status_url   => 'http://integration.wmflabs.org/zuul/status',
+zuul_url => '',  # FIXME
 config_git_branch=> 'labs',
 git_branch   => 'labs',
 git_dir  => $role::zuul::configuration::zuul_git_dir,
@@ -78,6 +79,7 @@
 gerrit_user  => 'jenkins-bot',
 url_pattern  => 
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
 status_url   => 'https://integration.wikimedia.org/zuul/',
+zuul_url => 'http://integration.wikimedia.org/zuul/git',
 config_git_branch=> 'master',
 git_branch   => 'master',
 git_dir  => $role::zuul::configuration::zuul_git_dir,
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index 09b2fef..659f75f 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -13,6 +13,7 @@
$gerrit_user,
$url_pattern,
$status_url,
+   $zuul_url,
$config_git_branch='master',
$git_branch='master',
$git_dir='/var/lib/zuul/git',
@@ -36,6 +37,7 @@
gerrit_user  => $gerrit_user,
url_pattern  => $url_pattern,
status_url   => $status_url,
+   zuul_url => $zuul_url,
git_branch   => $git_branch,
git_dir  => $git_dir,
push_change_refs => $push_change_refs,
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index a5591c2..10fe7a9 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -19,6 +19,7 @@
 $gerrit_baseurl = 'https://gerrit.wikimedia.org/r',
 $url_pattern,
 $status_url = "https://${::fqdn}/zuul/status";,
+$zuul_url = 'http://integration.wikimedia.org/zuul/git',
 $git_source_repo = 'https://gerrit.wikimedia.org/r/p/integration/zuul.git',
 $git_branch = 'master',
 $git_dir = '/var/lib/zuul/git',
diff --git a/modules/zuul/templates/zuul.conf.erb 
b/modules/zuul/templates/zuul.conf.erb
index da48e66..1eb2b42 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -24,3 +24,4 @@
 push_change_refs=<%= @push_change_refs %>
 url_pattern=<%= @url_pattern %>
 status_url=<%= @status_url %>
+zuul_url=<%= @zuul_url %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1cce4ea87e2b01be12904d328f4bfbf3cb1df04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] replacing star cert with noc.wikimedia.org on fenari - change (operations/puppet)

2014-01-06 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: replacing star cert with noc.wikimedia.org on fenari
..

replacing star cert with noc.wikimedia.org on fenari

Change-Id: Icd40778adb432dbe368311dbcd25f4678027145e
---
M files/apache/sites/noc.wikimedia.org
M manifests/site.pp
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/105842/1

diff --git a/files/apache/sites/noc.wikimedia.org 
b/files/apache/sites/noc.wikimedia.org
index fdde89c..86b5ffe 100644
--- a/files/apache/sites/noc.wikimedia.org
+++ b/files/apache/sites/noc.wikimedia.org
@@ -51,8 +51,8 @@
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+   SSLCertificateFile /etc/ssl/certs/noc.wikimedia.org.pem
+   SSLCertificateKeyFile /etc/ssl/private/noc.wikimedia.org.key
 
# Possible values include: debug, info, notice, warn, error, crit,
# alert, emerg.
diff --git a/manifests/site.pp b/manifests/site.pp
index 37590c7..fbfb296 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -907,7 +907,7 @@
 generic::wikidev-umask,
 misc::dsh,
 ssh::hostkeys-collect
-install_certificate{ "star.wikimedia.org": }
+install_certificate{ "noc.wikimedia.org": }
 }
 
 node "fluorine.eqiad.wmnet" {

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

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

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

[MediaWiki-commits] [Gerrit] Replace wildcard with icinga.wikimedia.org certificate - change (operations/puppet)

2014-01-06 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Replace wildcard with icinga.wikimedia.org certificate
..


Replace wildcard with icinga.wikimedia.org certificate

getting rid of the old wildcard cert in use on misc boxes, replacing
with the specific icinga.wikimedia.org FQDN cert

Change-Id: I4780805effcea89b20197760202c64e9a92c74b8
RT: 6574
---
M manifests/misc/icinga.pp
M templates/apache/sites/icinga.wikimedia.org.erb
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index bc856b2..e9a5989 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -116,7 +116,7 @@
   }
 
   apache_site { 'icinga': name => 'icinga.wikimedia.org' }
-  install_certificate{ 'star.wikimedia.org': }
+  install_certificate{ 'icinga.wikimedia.org': }
 
 }
 
diff --git a/templates/apache/sites/icinga.wikimedia.org.erb 
b/templates/apache/sites/icinga.wikimedia.org.erb
index a0d165f..7dcfd53 100644
--- a/templates/apache/sites/icinga.wikimedia.org.erb
+++ b/templates/apache/sites/icinga.wikimedia.org.erb
@@ -23,8 +23,8 @@
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/private/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+   SSLCertificateFile /etc/ssl/private/icinga.wikimedia.org.pem
+   SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem
DocumentRoot /usr/share/icinga/htdocs
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4780805effcea89b20197760202c64e9a92c74b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding python-stompy for awight - change (operations/puppet)

2013-12-26 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding python-stompy for awight
..


adding python-stompy for awight

Change-Id: I20c1fe2437046765b2c6128d5c6168718b5b9b98
---
M manifests/misc/fundraising.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index 2b3e320..af65bdc 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -12,7 +12,7 @@
package { [ 'libapache2-mod-php5', 'php5-cli', 'php-pear', 
'php5-common', 'php5-curl', 'php5-dev', 'php5-gd',
'php5-mysql', 'php5-sqlite', 'subversion', 'phpunit', 
'python-scipy', 'python-matplotlib', 'python-libxml2',
'python-sqlite', 'python-sqlitecachec', 'python-urlgrabber', 
'python-argparse', 'python-dev',
-   'python-setuptools', 'python-mysqldb', 'libapache2-mod-python', 
'r-base', 'r-cran-rmysql', 'python-rpy2' ]:
+   'python-setuptools', 'python-mysqldb', 'libapache2-mod-python', 
'r-base', 'r-cran-rmysql', 'python-rpy2', 'python-stompy' ]:
ensure => latest;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] adding python-stompy for awight - change (operations/puppet)

2013-12-26 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding python-stompy for awight
..

adding python-stompy for awight

Change-Id: I20c1fe2437046765b2c6128d5c6168718b5b9b98
---
M manifests/misc/fundraising.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/103876/1

diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index 2b3e320..af65bdc 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -12,7 +12,7 @@
package { [ 'libapache2-mod-php5', 'php5-cli', 'php-pear', 
'php5-common', 'php5-curl', 'php5-dev', 'php5-gd',
'php5-mysql', 'php5-sqlite', 'subversion', 'phpunit', 
'python-scipy', 'python-matplotlib', 'python-libxml2',
'python-sqlite', 'python-sqlitecachec', 'python-urlgrabber', 
'python-argparse', 'python-dev',
-   'python-setuptools', 'python-mysqldb', 'libapache2-mod-python', 
'r-base', 'r-cran-rmysql', 'python-rpy2' ]:
+   'python-setuptools', 'python-mysqldb', 'libapache2-mod-python', 
'r-base', 'r-cran-rmysql', 'python-rpy2', 'python-stompy' ]:
ensure => latest;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] removing asher's access per his request - change (operations/puppet)

2013-12-09 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: removing asher's access per his request
..


removing asher's access per his request

Change-Id: Ic4952c8853cd39d4913f891f5223598d4ef9b755
---
M manifests/admins.pp
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/manifests/admins.pp b/manifests/admins.pp
index 726ef8a..9f7592b 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1700,6 +1700,7 @@
class asher inherits baseaccount {
$username = "asher"
$realname = "Asher Feldman"
+   $enabled = false
$uid = 561
 
unixaccount { $realname: username => $username, uid => $uid, 
gid => $gid }
@@ -1709,7 +1710,7 @@
 
 ssh_authorized_key {
"afeldman@WMF263s-MacBook-Pro.local":
-   ensure  => present,
+   ensure  => absent,
user=> $username,
type=> "ssh-dss",
key => 
"B3NzaC1kc3MAAACBAMcz1/0w6tfUkS2RWeLS4voMnMcKf2Q3EVfAcBX818ssY/aGusB/CAl/NuUyPIzTHIE2gd62WYH0Krz+CGZ1qOzAxs+IoB3CjjbulXf0uIatcTu/OSrqoe0hXf6G1UidVl+7Ymomlwb7AMWScZeWKHmECbc5QQjLJ4h/Ply/65P7FQDJuUJ9zKoPn2GNx22da5s0WSS6gQAAAIAZr4we0xRJRk7pTLO+Ep+GOnccLycZlNctUMTZ5oDlGk9BJT3pjiYE3BXd1k8OwlDiLE37EiLP4oJXIsVXSm0EuN3o65Oi1opB7rV4rL7nbjZQdJUu+UN8ikQPe+3KQsiziupsP8nufgvufvbmQECNLHkYEiZsDdQjhCwHafdjUQAAAIAJX+wEMbR2dNlh/+sX3QTxYLSMuOKSGp9SzPwqyqX82GO4oD7iFKX6mBFYmFLq/JopGwKqxUQKhBhkBLYaCEN0K+DOnkxNz8oeGRx2YvQLfOiBISuHHL0QMy9RfTvGl7eE5JrwE6hkOzN3U2CeI2fHcsosdsL0poDmUz68GpOGTA==";
@@ -3188,7 +3189,7 @@
include accounts::akosiaris
include accounts::andrewb
include accounts::ariel
-   include accounts::asher
+   include accounts::asher # disabled
include accounts::bblack
include accounts::ben # disabled
include accounts::brion # shell re-enabled dz 20121004

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

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

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

[MediaWiki-commits] [Gerrit] removing asher's access per his request - change (operations/puppet)

2013-12-09 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: removing asher's access per his request
..

removing asher's access per his request

Change-Id: Ic4952c8853cd39d4913f891f5223598d4ef9b755
---
M manifests/admins.pp
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/100504/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index 726ef8a..9f7592b 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1700,6 +1700,7 @@
class asher inherits baseaccount {
$username = "asher"
$realname = "Asher Feldman"
+   $enabled = false
$uid = 561
 
unixaccount { $realname: username => $username, uid => $uid, 
gid => $gid }
@@ -1709,7 +1710,7 @@
 
 ssh_authorized_key {
"afeldman@WMF263s-MacBook-Pro.local":
-   ensure  => present,
+   ensure  => absent,
user=> $username,
type=> "ssh-dss",
key => 
"B3NzaC1kc3MAAACBAMcz1/0w6tfUkS2RWeLS4voMnMcKf2Q3EVfAcBX818ssY/aGusB/CAl/NuUyPIzTHIE2gd62WYH0Krz+CGZ1qOzAxs+IoB3CjjbulXf0uIatcTu/OSrqoe0hXf6G1UidVl+7Ymomlwb7AMWScZeWKHmECbc5QQjLJ4h/Ply/65P7FQDJuUJ9zKoPn2GNx22da5s0WSS6gQAAAIAZr4we0xRJRk7pTLO+Ep+GOnccLycZlNctUMTZ5oDlGk9BJT3pjiYE3BXd1k8OwlDiLE37EiLP4oJXIsVXSm0EuN3o65Oi1opB7rV4rL7nbjZQdJUu+UN8ikQPe+3KQsiziupsP8nufgvufvbmQECNLHkYEiZsDdQjhCwHafdjUQAAAIAJX+wEMbR2dNlh/+sX3QTxYLSMuOKSGp9SzPwqyqX82GO4oD7iFKX6mBFYmFLq/JopGwKqxUQKhBhkBLYaCEN0K+DOnkxNz8oeGRx2YvQLfOiBISuHHL0QMy9RfTvGl7eE5JrwE6hkOzN3U2CeI2fHcsosdsL0poDmUz68GpOGTA==";
@@ -3188,7 +3189,7 @@
include accounts::akosiaris
include accounts::andrewb
include accounts::ariel
-   include accounts::asher
+   include accounts::asher # disabled
include accounts::bblack
include accounts::ben # disabled
include accounts::brion # shell re-enabled dz 20121004

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

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

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

[MediaWiki-commits] [Gerrit] draining ulsfo of all traffic until TiNet link is confirmed ... - change (operations/dns)

2013-11-07 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: draining ulsfo of all traffic until TiNet link is confirmed 
working
..


draining ulsfo of all traffic until TiNet link is confirmed working

Change-Id: Id7084db7616b14a64e936d4cd026dc384ad676f8
---
M config-geo
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/config-geo b/config-geo
index 6c14ac5..de8f03c 100644
--- a/config-geo
+++ b/config-geo
@@ -19,24 +19,24 @@
IQ => esams, # Iraq
IR => esams, # Iran (Islamic Republic 
of)
JO => esams, # Jordan
-   JP => ulsfo, # Japan
-   KH => ulsfo, # Cambodia
-   KP => ulsfo, # Korea, Democratic 
People's Republic of
-   KR => ulsfo, # Korea, Republic of
+   JP => eqiad, # Japan
+   KH => eqiad, # Cambodia
+   KP => eqiad, # Korea, Democratic 
People's Republic of
+   KR => eqiad, # Korea, Republic of
KW => esams, # Kuwait
LA => eqiad, # Lao People's Democratic 
Republic
LB => esams, # Lebanon
MN => eqiad, # Mongolia
-   MY => ulsfo, # Malaysia
+   MY => eqiad, # Malaysia
OM => esams, # Oman
-   PH => ulsfo, # Philippines
+   PH => eqiad, # Philippines
PS => esams, # Palestine, State of
QA => esams, # Qatar
SA => esams, # Saudi Arabia
-   SG => ulsfo, # Singapore
+   SG => eqiad, # Singapore
SY => esams, # Syrian Arab Republic
TH => eqiad, # Thailand
-   TW => ulsfo, # Taiwan, Province of China
+   TW => eqiad, # Taiwan, Province of China
VN => eqiad, # Viet Nam
YE => esams, # Yemen
},
@@ -165,7 +165,7 @@
YT => eqiad, # Yukon Territory
},
},
-   OC => ulsfo,
+   OC => eqiad,
default => eqiad,
}
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7084db7616b14a64e936d4cd026dc384ad676f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 

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

[MediaWiki-commits] [Gerrit] draining ulsfo of all traffic until TiNet link is confirmed ... - change (operations/dns)

2013-11-07 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: draining ulsfo of all traffic until TiNet link is confirmed 
working
..

draining ulsfo of all traffic until TiNet link is confirmed working

Change-Id: Id7084db7616b14a64e936d4cd026dc384ad676f8
---
M config-geo
1 file changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/83/94283/1

diff --git a/config-geo b/config-geo
index 6c14ac5..de8f03c 100644
--- a/config-geo
+++ b/config-geo
@@ -19,24 +19,24 @@
IQ => esams, # Iraq
IR => esams, # Iran (Islamic Republic 
of)
JO => esams, # Jordan
-   JP => ulsfo, # Japan
-   KH => ulsfo, # Cambodia
-   KP => ulsfo, # Korea, Democratic 
People's Republic of
-   KR => ulsfo, # Korea, Republic of
+   JP => eqiad, # Japan
+   KH => eqiad, # Cambodia
+   KP => eqiad, # Korea, Democratic 
People's Republic of
+   KR => eqiad, # Korea, Republic of
KW => esams, # Kuwait
LA => eqiad, # Lao People's Democratic 
Republic
LB => esams, # Lebanon
MN => eqiad, # Mongolia
-   MY => ulsfo, # Malaysia
+   MY => eqiad, # Malaysia
OM => esams, # Oman
-   PH => ulsfo, # Philippines
+   PH => eqiad, # Philippines
PS => esams, # Palestine, State of
QA => esams, # Qatar
SA => esams, # Saudi Arabia
-   SG => ulsfo, # Singapore
+   SG => eqiad, # Singapore
SY => esams, # Syrian Arab Republic
TH => eqiad, # Thailand
-   TW => ulsfo, # Taiwan, Province of China
+   TW => eqiad, # Taiwan, Province of China
VN => eqiad, # Viet Nam
YE => esams, # Yemen
},
@@ -165,7 +165,7 @@
YT => eqiad, # Yukon Territory
},
},
-   OC => ulsfo,
+   OC => eqiad,
default => eqiad,
}
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7084db7616b14a64e936d4cd026dc384ad676f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] moved parsoid into proper ssubnet Created comments about LVS... - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: moved parsoid into proper ssubnet Created comments about LVS 
subnet plans
..


moved parsoid into proper ssubnet
Created comments about LVS subnet plans

Change-Id: I4a03f27869a156b9a6cf208a0954c521127a6422
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index f39c4e3..6ed64ad 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -133,12 +133,14 @@
 218 1H  IN PTR  pfw1-eqiad.wikimedia.org.
 219 1H  IN PTR  pfw2-eqiad.wikimedia.org.
 
-;208.80.154.220/31 (cr2-eqiad <--> pfw2-eqiad)
+; 208.80.154.220/31 (cr2-eqiad <--> pfw2-eqiad)
 220 1H  IN PTR  xe-5-0-3.cr2-eqiad.wikimedia.org.
 221 1H  IN PTR  xe-15-0-0.pfw2-eqiad.wikimedia.org.
 
 ; LVS out-of-subnet service IPs (208.80.154.224/27)
+; FIXME : These will be slowly rearranged to fit
 
+; Desktop Text & Assets  208.80.154.224 - 231 (208.80.154.224/29)  
 224 1H  IN PTR  wikimedia-lb.eqiad.wikimedia.org.
 225 1H  IN PTR  wikipedia-lb.eqiad.wikimedia.org.
 226 1H  IN PTR  wiktionary-lb.eqiad.wikimedia.org.
@@ -147,6 +149,8 @@
 229 1H  IN PTR  wikisource-lb.eqiad.wikimedia.org.
 230 1H  IN PTR  wikinews-lb.eqiad.wikimedia.org.
 231 1H  IN PTR  wikiversity-lb.eqiad.wikimedia.org.
+
+; Mobile Zero & general Support 208.80.154.232 - 39 (208.80.154.232/29)
 232 1H  IN PTR  mediawiki-lb.eqiad.wikimedia.org.
 233 1H  IN PTR  foundation-lb.eqiad.wikimedia.org.
 234 1H  IN PTR  bits-lb.eqiad.wikimedia.org.
@@ -155,8 +159,12 @@
 237 1H  IN PTR  payments-lb.eqiad.wikimedia.org.
 238 1H  IN PTR  ns0.wikimedia.org.
 239 1H  IN PTR  dns-rec-lb.eqiad.wikimedia.org.
+
+; Multimedia 208.80.154.240 - 247 (208.80.154.240/29)
 240 1H  IN PTR  osm-lb.eqiad.wikimedia.org.
 241 1H  IN PTR  misc-web-lb.eqiad.wikimedia.org.
 242 1H  IN PTR  wikidata-lb.eqiad.wikimedia.org.
 243 1H  IN PTR  wikivoyage-lb.eqiad.wikimedia.org.
-244 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
+
+; Misc 208.80.154.248 - 208.80.154.255 (208.80.154.248/29)
+248 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4f45e8c..7a92023 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,7 +375,7 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
-parsoid-lb.eqiad   1H  IN A208.80.154.244
+parsoid-lb.eqiad   1H  IN A208.80.154.248
1H  2620:0:861:ed1a::15
 
 ;;; ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a03f27869a156b9a6cf208a0954c521127a6422
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] fixed the ip for parsoid-lb.eqiad.wikimedia.org - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fixed the ip for parsoid-lb.eqiad.wikimedia.org
..


fixed the ip for parsoid-lb.eqiad.wikimedia.org

Change-Id: I978c4b23e90f8275a8de68ba456395055639cddc
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4acae6c..4f45e8c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,7 +375,7 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
-parsoid-lb.eqiad   1H  IN A208.80.154.162
+parsoid-lb.eqiad   1H  IN A208.80.154.244
1H  2620:0:861:ed1a::15
 
 ;;; ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I978c4b23e90f8275a8de68ba456395055639cddc
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] moved parsoid into proper ssubnet Created comments about LVS... - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: moved parsoid into proper ssubnet Created comments about LVS 
subnet plans
..

moved parsoid into proper ssubnet
Created comments about LVS subnet plans

Change-Id: I4a03f27869a156b9a6cf208a0954c521127a6422
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/01/93601/1

diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index f39c4e3..6ed64ad 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -133,12 +133,14 @@
 218 1H  IN PTR  pfw1-eqiad.wikimedia.org.
 219 1H  IN PTR  pfw2-eqiad.wikimedia.org.
 
-;208.80.154.220/31 (cr2-eqiad <--> pfw2-eqiad)
+; 208.80.154.220/31 (cr2-eqiad <--> pfw2-eqiad)
 220 1H  IN PTR  xe-5-0-3.cr2-eqiad.wikimedia.org.
 221 1H  IN PTR  xe-15-0-0.pfw2-eqiad.wikimedia.org.
 
 ; LVS out-of-subnet service IPs (208.80.154.224/27)
+; FIXME : These will be slowly rearranged to fit
 
+; Desktop Text & Assets  208.80.154.224 - 231 (208.80.154.224/29)  
 224 1H  IN PTR  wikimedia-lb.eqiad.wikimedia.org.
 225 1H  IN PTR  wikipedia-lb.eqiad.wikimedia.org.
 226 1H  IN PTR  wiktionary-lb.eqiad.wikimedia.org.
@@ -147,6 +149,8 @@
 229 1H  IN PTR  wikisource-lb.eqiad.wikimedia.org.
 230 1H  IN PTR  wikinews-lb.eqiad.wikimedia.org.
 231 1H  IN PTR  wikiversity-lb.eqiad.wikimedia.org.
+
+; Mobile Zero & general Support 208.80.154.232 - 39 (208.80.154.232/29)
 232 1H  IN PTR  mediawiki-lb.eqiad.wikimedia.org.
 233 1H  IN PTR  foundation-lb.eqiad.wikimedia.org.
 234 1H  IN PTR  bits-lb.eqiad.wikimedia.org.
@@ -155,8 +159,12 @@
 237 1H  IN PTR  payments-lb.eqiad.wikimedia.org.
 238 1H  IN PTR  ns0.wikimedia.org.
 239 1H  IN PTR  dns-rec-lb.eqiad.wikimedia.org.
+
+; Multimedia 208.80.154.240 - 247 (208.80.154.240/29)
 240 1H  IN PTR  osm-lb.eqiad.wikimedia.org.
 241 1H  IN PTR  misc-web-lb.eqiad.wikimedia.org.
 242 1H  IN PTR  wikidata-lb.eqiad.wikimedia.org.
 243 1H  IN PTR  wikivoyage-lb.eqiad.wikimedia.org.
-244 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
+
+; Misc 208.80.154.248 - 208.80.154.255 (208.80.154.248/29)
+248 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4f45e8c..7a92023 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,7 +375,7 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
-parsoid-lb.eqiad   1H  IN A208.80.154.244
+parsoid-lb.eqiad   1H  IN A208.80.154.248
1H  2620:0:861:ed1a::15
 
 ;;; ulsfo

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a03f27869a156b9a6cf208a0954c521127a6422
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] fixed the ip for parsoid-lb.eqiad.wikimedia.org - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: fixed the ip for parsoid-lb.eqiad.wikimedia.org
..

fixed the ip for parsoid-lb.eqiad.wikimedia.org

Change-Id: I978c4b23e90f8275a8de68ba456395055639cddc
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/67/93567/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4acae6c..4f45e8c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,7 +375,7 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
-parsoid-lb.eqiad   1H  IN A208.80.154.162
+parsoid-lb.eqiad   1H  IN A208.80.154.244
1H  2620:0:861:ed1a::15
 
 ;;; ulsfo

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I978c4b23e90f8275a8de68ba456395055639cddc
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding new public IP for parsoid - change (operations/puppet)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding new public IP for parsoid
..

adding new public IP for parsoid

Change-Id: If5d6e87ec248eff698c5f1689dc40135bdc65c41
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 22 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/93527/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 1b4a55a..d17d93d 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -405,7 +405,10 @@
'parsoidcache' => {
'eqiad' => "10.2.2.29",
},
-   'search' => {
+   'publicparsoid' => {
+   'eqiad' => "208.80.154.162",
+   },
+   'search'=> {
'eqiad' => "10.2.2.30",
},
},
@@ -454,10 +457,11 @@
'pmtpa' => {
'uploadlb'  => [ '10.4.0.166', 
'10.4.0.187', ],
'uploadsvc' => [ '10.4.0.166', 
'10.4.0.187', ],
-},
+   },
},
'parsoid' => {},
'parsoidcache' => {},
+   'publicparsoid' => {},
'search' => {},
}
}
@@ -857,6 +861,20 @@
'IdleConnection' => 
$idleconnection_monitor_options,
},
},
+   'publicparsoid' => {
+   'description' => "Public parsoid wikitext parser for 
VisualEditor",
+   'class' => "high-traffic2",
+   'sites' => [ "eqiad" ],
+   'ip' => $service_ips['publicparsoid'][$::site],
+   'port' => 8000,
+   'bgp' => "yes",
+   'depool-threshold' => ".5",
+   'monitors' => {
+   'ProxyFetch' => {
+   'url' => [ 'http://localhost:8000/' ],
+   },
+   'IdleConnection' => 
$idleconnection_monitor_options,
+   },
'parsoidcache' => {
'description' => "Varnish caches in front of Parsoid",
'class' => "low-traffic",
@@ -1104,6 +1122,7 @@
monitor_service_lvs_http { "ms-fe.pmtpa.wmnet": ip_address => 
"10.2.1.27", check_command => 
"check_http_lvs!ms-fe.pmtpa.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "ms-fe.eqiad.wmnet": ip_address => 
"10.2.2.27", check_command => 
"check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "parsoid.svc.eqiad.wmnet": ip_address => 
"10.2.2.28", check_command => "check_http_on_port!8000", contact_group => 
"admins,parsoid" }
+   monitor_service_lvs_http { "parsoid-lb.eqiad.wikimedia.org": ip_address 
=> "208.80.154.162", check_command => "check_http_on_port!8000", contact_group 
=> "admins,parsoid" }
monitor_service_lvs_http { "parsoidcache.svc.eqiad.wmnet": ip_address 
=> "10.2.2.29", check_command => "check_http_lvs!parsoid!/", contact_group => 
"admins,parsoid" }
monitor_service_lvs_http { "search.svc.eqiad.wmnet": ip_address => 
"10.2.2.30", check_command => "check_http_on_port!9200", contact_group => 
"admins" }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 6775e93..8826d33 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1572,6 +1572,7 @@
 $sip['dns_rec'][$::site],
 $sip['osm'][$::site],
 $sip['misc_web'][$::site],
+$sip['publicparsoid'][$::site],
 ],
 /^lvs100[36]$/ => [
 $sip['apaches'][$::site],

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

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

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

[MediaWiki-commits] [Gerrit] adding new parsoid public IP - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding new parsoid public IP
..

adding new parsoid public IP

Change-Id: I1bf69af0bd9c5274599430c356d986c443e5f123
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/22/93522/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 93fec33..11d6829 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -153,6 +153,7 @@
 1.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
misc-web-lb.eqiad.wikimedia.org.
 2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
wikidata-lb.eqiad.wikimedia.org.
 3.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
wikivoyage-lb.eqiad.wikimedia.org.
+5.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
 
 ; Neighbor blocks
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 74b8d64..f39c4e3 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -159,3 +159,4 @@
 241 1H  IN PTR  misc-web-lb.eqiad.wikimedia.org.
 242 1H  IN PTR  wikidata-lb.eqiad.wikimedia.org.
 243 1H  IN PTR  wikivoyage-lb.eqiad.wikimedia.org.
+244 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3c8e69d..4acae6c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,6 +375,9 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
+parsoid-lb.eqiad   1H  IN A208.80.154.162
+   1H  2620:0:861:ed1a::15
+
 ;;; ulsfo
 text-lb.ulsfo   1H  IN A198.35.26.96
 1H  IN  2620:0:863:ed1a::1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bf69af0bd9c5274599430c356d986c443e5f123
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding new parsoid public IP - change (operations/dns)

2013-11-04 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding new parsoid public IP
..


adding new parsoid public IP

Change-Id: I1bf69af0bd9c5274599430c356d986c443e5f123
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 93fec33..11d6829 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -153,6 +153,7 @@
 1.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
misc-web-lb.eqiad.wikimedia.org.
 2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
wikidata-lb.eqiad.wikimedia.org.
 3.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
wikivoyage-lb.eqiad.wikimedia.org.
+5.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
 
 ; Neighbor blocks
 
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 74b8d64..f39c4e3 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -159,3 +159,4 @@
 241 1H  IN PTR  misc-web-lb.eqiad.wikimedia.org.
 242 1H  IN PTR  wikidata-lb.eqiad.wikimedia.org.
 243 1H  IN PTR  wikivoyage-lb.eqiad.wikimedia.org.
+244 1H IN PTR  parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3c8e69d..4acae6c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -375,6 +375,9 @@
 
 geoiplookup-lb.eqiad   1H  IN A208.80.154.234
 
+parsoid-lb.eqiad   1H  IN A208.80.154.162
+   1H  2620:0:861:ed1a::15
+
 ;;; ulsfo
 text-lb.ulsfo   1H  IN A198.35.26.96
 1H  IN  2620:0:863:ed1a::1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bf69af0bd9c5274599430c356d986c443e5f123
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Revert "Send OC text traffic to ulsfo" - change (operations/dns)

2013-10-31 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Revert "Send OC text traffic to ulsfo"
..


Revert "Send OC text traffic to ulsfo"

This reverts commit 636055df58bdb619b759384505625b20ed840354.

Change-Id: I7b809f7c36fcc2555324d1c4ab1ac0e0aba8675a
---
M config-geo
1 file changed, 12 insertions(+), 24 deletions(-)

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



diff --git a/config-geo b/config-geo
index c753786..4b7d684 100644
--- a/config-geo
+++ b/config-geo
@@ -244,93 +244,83 @@
}
# text
foundation-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => foundation-lb.pmtpa.wikimedia.org.
eqiad => foundation-lb.eqiad.wikimedia.org.
esams => foundation-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
mediawiki-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => mediawiki-lb.pmtpa.wikimedia.org.
eqiad => mediawiki-lb.eqiad.wikimedia.org.
esams => mediawiki-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikibooks-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikibooks-lb.pmtpa.wikimedia.org.
eqiad => wikibooks-lb.eqiad.wikimedia.org.
esams => wikibooks-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikimedia-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikimedia-lb.pmtpa.wikimedia.org.
eqiad => wikimedia-lb.eqiad.wikimedia.org.
esams => wikimedia-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikinews-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikinews-lb.pmtpa.wikimedia.org.
eqiad => wikinews-lb.eqiad.wikimedia.org.
esams => wikinews-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikipedia-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikipedia-lb.pmtpa.wikimedia.org.
eqiad => wikipedia-lb.eqiad.wikimedia.org.
esams => wikipedia-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikiquote-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikiquote-lb.pmtpa.wikimedia.org.
eqiad => wikiquote-lb.eqiad.wikimedia.org.
esams => wikiquote-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikisource-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikisource-lb.pmtpa.wikimedia.org.
eqiad => wikisource-lb.eqiad.wikimedia.org.
esams => wikisource-lb.esams.wikimedia.org.
-   ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
wikiversity-lb => {
-   map => ulsfo-migration-map
+   map => generic-map
dcmap => {
pmtpa => wikiversity-lb.pmtpa.wikimedia.org.
eqiad => wikiversity-lb.eqiad.wikimedia.org.

[MediaWiki-commits] [Gerrit] decommissioned cp1-10 - change (operations/dns)

2013-10-30 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: decommissioned cp1-10
..


decommissioned cp1-10

Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b
---
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 0 insertions(+), 20 deletions(-)

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



diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index 509aceb..88cc9d3 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -30,16 +30,6 @@
 19 1H IN PTR   ssl4.wikimedia.org.
 20 1H IN PTR   gurvin.wikimedia.org.
 21 1H IN PTR   yvon.wikimedia.org.
-22 1H IN PTR   cp1.wikimedia.org.
-23 1H IN PTR   cp2.wikimedia.org.
-24 1H IN PTR   cp3.wikimedia.org.
-25 1H IN PTR   cp4.wikimedia.org.
-26 1H IN PTR   cp5.wikimedia.org.
-27 1H IN PTR   cp6.wikimedia.org.
-28 1H IN PTR   cp7.wikimedia.org.
-29 1H IN PTR   cp8.wikimedia.org.
-30 1H IN PTR   cp9.wikimedia.org.
-31 1H IN PTR   cp10.wikimedia.org.
 32 1H IN PTR   virt0.wikimedia.org.
 33 1H IN PTR   labs-ns0.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4a71e69..59a0fce 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -120,16 +120,6 @@
 chromium   1H  IN A208.80.154.157
1H  IN  2620:0:861:2:208:80:154:157
 colby  1H  IN A208.80.152.135
-cp11H  IN A208.80.152.22
-cp21H  IN A208.80.152.23
-cp31H  IN A208.80.152.24
-cp41H  IN A208.80.152.25
-cp51H  IN A208.80.152.26
-cp61H  IN A208.80.152.27
-cp71H  IN A208.80.152.28
-cp81H  IN A208.80.152.29
-cp91H  IN A208.80.152.30
-cp10   1H  IN A208.80.152.31
 dataset2   1H  IN A208.80.152.185
 dataset10011H  IN A208.80.154.11
 db61   1H  IN A208.80.152.231

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] decommissioned cp1-10 - change (operations/dns)

2013-10-30 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: decommissioned cp1-10
..

decommissioned cp1-10

Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b
---
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/42/92642/1

diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index 509aceb..88cc9d3 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -30,16 +30,6 @@
 19 1H IN PTR   ssl4.wikimedia.org.
 20 1H IN PTR   gurvin.wikimedia.org.
 21 1H IN PTR   yvon.wikimedia.org.
-22 1H IN PTR   cp1.wikimedia.org.
-23 1H IN PTR   cp2.wikimedia.org.
-24 1H IN PTR   cp3.wikimedia.org.
-25 1H IN PTR   cp4.wikimedia.org.
-26 1H IN PTR   cp5.wikimedia.org.
-27 1H IN PTR   cp6.wikimedia.org.
-28 1H IN PTR   cp7.wikimedia.org.
-29 1H IN PTR   cp8.wikimedia.org.
-30 1H IN PTR   cp9.wikimedia.org.
-31 1H IN PTR   cp10.wikimedia.org.
 32 1H IN PTR   virt0.wikimedia.org.
 33 1H IN PTR   labs-ns0.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4a71e69..59a0fce 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -120,16 +120,6 @@
 chromium   1H  IN A208.80.154.157
1H  IN  2620:0:861:2:208:80:154:157
 colby  1H  IN A208.80.152.135
-cp11H  IN A208.80.152.22
-cp21H  IN A208.80.152.23
-cp31H  IN A208.80.152.24
-cp41H  IN A208.80.152.25
-cp51H  IN A208.80.152.26
-cp61H  IN A208.80.152.27
-cp71H  IN A208.80.152.28
-cp81H  IN A208.80.152.29
-cp91H  IN A208.80.152.30
-cp10   1H  IN A208.80.152.31
 dataset2   1H  IN A208.80.152.185
 dataset10011H  IN A208.80.154.11
 db61   1H  IN A208.80.152.231

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27d90e78db2f3e3268c79454e6977c90999d054b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] remove entries for sq87-106, these hosts never existed - change (operations/dns)

2013-10-30 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: remove entries for sq87-106, these hosts never existed
..


remove entries for sq87-106, these hosts never existed

Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a
---
M templates/152.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 0 insertions(+), 40 deletions(-)

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



diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index ce710b3..509aceb 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -42,18 +42,10 @@
 31 1H IN PTR   cp10.wikimedia.org.
 32 1H IN PTR   virt0.wikimedia.org.
 33 1H IN PTR   labs-ns0.wikimedia.org.
-34 1H IN PTR   sq90.wikimedia.org.
-35 1H IN PTR   sq91.wikimedia.org.
-36 1H IN PTR   sq92.wikimedia.org.
-37 1H IN PTR   sq93.wikimedia.org.
-38 1H IN PTR   sq94.wikimedia.org.
-39 1H IN PTR   sq95.wikimedia.org.
-40 1H IN PTR   sq96.wikimedia.org.
 
 47 1H IN PTR   sq37.wikimedia.org.
 48 1H IN PTR   ms10.wikimedia.org.
 
-50 1H IN PTR   sq89.wikimedia.org.
 53 1H IN PTR   sq43.wikimedia.org.
 54 1H IN PTR   sq44.wikimedia.org.
 
@@ -96,17 +88,7 @@
 94 1H IN PTR   sq84.wikimedia.org.
 95 1H IN PTR   sq85.wikimedia.org.
 96 1H IN PTR   sq86.wikimedia.org.
-97 1H IN PTR   sq87.wikimedia.org.
-98 1H IN PTR   sq88.wikimedia.org.
 
-1011H IN PTR   sq97.wikimedia.org.
-1021H IN PTR   sq98.wikimedia.org.
-1031H IN PTR   sq99.wikimedia.org.
-1041H IN PTR   sq100.wikimedia.org.
-1051H IN PTR   sq101.wikimedia.org.
-1061H IN PTR   sq102.wikimedia.org.
-107 1H IN PTR  sq103.wikimedia.org.
-1081H IN PTR   sq104.wikimedia.org.
 
 1101H IN PTR   lvs5.wikimedia.org.
 1111H IN PTR   lvs6.wikimedia.org.
@@ -163,8 +145,6 @@
 
 1811H IN PTR   pdf3.wikimedia.org.
 
-1821H IN PTR   sq105.wikimedia.org.
-1831H IN PTR   sq106.wikimedia.org.
 1841H IN PTR   emery.wikimedia.org.
 1851H IN PTR   dataset2.wikimedia.org.
 1861H IN PTR   mchenry.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index af7b844..4a71e69 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -256,26 +256,6 @@
 sq84   1H  IN A208.80.152.94
 sq85   1H  IN A208.80.152.95
 sq86   1H  IN A208.80.152.96
-sq87   1H  IN A208.80.152.97
-sq88   1H   IN A208.80.152.98
-sq89   1H   IN A208.80.152.50
-sq90   1H   IN A208.80.152.34
-sq91   1H   IN A208.80.152.35
-sq92   1H   IN A208.80.152.36
-sq93   1H   IN A208.80.152.37
-sq94   1H   IN A208.80.152.38
-sq95   1H   IN A208.80.152.39
-sq96   1H   IN A208.80.152.40
-sq97   1H   IN A208.80.152.101
-sq98   1H   IN A208.80.152.102
-sq99   1H   IN A208.80.152.103
-sq100  1H   IN A208.80.152.104
-sq101  1H   IN A208.80.152.105
-sq102  1H   IN A208.80.152.106
-sq103  1H   IN A208.80.152.107
-sq104  1H   IN A208.80.152.108
-sq105  1H   IN A208.80.152.182
-sq106  1H   IN A208.80.152.183
 ssl10011H  IN A208.80.154.133
1H  IN  2620:0:861:2:208:80:154:133
 ssl10021H  IN A208.80.154.134

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1751710cfbdc49af91ad24df40d36edcaa6d15a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] IPv6 blocks for ulsfo interconnects and loopbacks - change (operations/dns)

2013-10-15 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: IPv6 blocks for ulsfo interconnects and loopbacks
..


IPv6 blocks for ulsfo interconnects and loopbacks

Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
---
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 26 insertions(+), 4 deletions(-)

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



diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2c9fd92..d0b36d0 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -13,7 +13,8 @@
 1D  IN NS   ns0.wikimedia.org.
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
-; Loopback IPs
+
+; Infrastructure IPs
 
 ; cr1-ulsfo <--> cr2-ulsfo (2620:0:863:fe00::/64)
 
@@ -28,10 +29,25 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
xe-5-2-2.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
 
+; cr1-ulsfo <--> br1-ulsfo (2620:0:863:fe02::/64)
+
+$ORIGIN 2.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr1-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br1-ulsfo.wikimedia.org.
+
+; cr2-ulsfo <--> br2-ulsfo (2620:0:863:fe03::/64)
+
+$ORIGIN 3.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr2-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br2-ulsfo.wikimedia.org.
+
+; Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-ulsfo.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr2-ulsfo.wikimedia.org.
+3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  br1-ulsfo.wikimedia.org.
+4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  br2-ulsfo.wikimedia.org.
 
 
 ; LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1d4a879..22dedf9 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -471,6 +471,12 @@
 
 ; Networking
 
+br1-ulsfo  1H  IN A198.35.26.194
+   2620:0:863:::3
+
+br2-ulsfo  1H  IN A198.35.26.195
+   2620:0:863:::4
+
 cr1-eqiad  1H  IN A208.80.154.196
IN  2620:0:861:::1
 
@@ -483,9 +489,6 @@
 cr1-ulsfo  1H  IN A198.35.26.192
IN  2620:0:863:::1
 
-cr2-ulsfo  1H  IN A198.35.26.193
-   IN  2620:0:863:::2
-
 cr2-eqiad  1H  IN A208.80.154.197
IN  2620:0:861:::2
 
@@ -495,6 +498,9 @@
 cr2-pmtpa  1H  IN A208.80.152.197
IN  2620:0:860:::5
 
+cr2-ulsfo  1H  IN A198.35.26.193
+   IN  2620:0:863:::2
+
 csw1-esams 1H  IN A91.198.174.247
1H  IN  2620:0:862:::1
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] IPv6 blocks for ulsfo interconnects and loopbacks - change (operations/dns)

2013-10-15 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: IPv6 blocks for ulsfo interconnects and loopbacks
..

IPv6 blocks for ulsfo interconnects and loopbacks

Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
---
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 26 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/22/89822/1

diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2c9fd92..d0b36d0 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -13,7 +13,8 @@
 1D  IN NS   ns0.wikimedia.org.
 1D  IN NS   ns1.wikimedia.org.
 1D  IN NS   ns2.wikimedia.org.
-; Loopback IPs
+
+; Infrastructure IPs
 
 ; cr1-ulsfo <--> cr2-ulsfo (2620:0:863:fe00::/64)
 
@@ -28,10 +29,25 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
xe-5-2-2.cr2-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
 
+; cr1-ulsfo <--> br1-ulsfo (2620:0:863:fe02::/64)
+
+$ORIGIN 2.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr1-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br1-ulsfo.wikimedia.org.
+
+; cr2-ulsfo <--> br2-ulsfo (2620:0:863:fe03::/64)
+
+$ORIGIN 3.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-0.cr2-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  lt0-1.br2-ulsfo.wikimedia.org.
+
+; Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-ulsfo.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr2-ulsfo.wikimedia.org.
+3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  br1-ulsfo.wikimedia.org.
+4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR  br2-ulsfo.wikimedia.org.
 
 
 ; LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1d4a879..22dedf9 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -471,6 +471,12 @@
 
 ; Networking
 
+br1-ulsfo  1H  IN A198.35.26.194
+   2620:0:863:::3
+
+br2-ulsfo  1H  IN A198.35.26.195
+   2620:0:863:::4
+
 cr1-eqiad  1H  IN A208.80.154.196
IN  2620:0:861:::1
 
@@ -483,9 +489,6 @@
 cr1-ulsfo  1H  IN A198.35.26.192
IN  2620:0:863:::1
 
-cr2-ulsfo  1H  IN A198.35.26.193
-   IN  2620:0:863:::2
-
 cr2-eqiad  1H  IN A208.80.154.197
IN  2620:0:861:::2
 
@@ -495,6 +498,9 @@
 cr2-pmtpa  1H  IN A208.80.152.197
IN  2620:0:860:::5
 
+cr2-ulsfo  1H  IN A198.35.26.193
+   IN  2620:0:863:::2
+
 csw1-esams 1H  IN A91.198.174.247
1H  IN  2620:0:862:::1
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] fixing rancid file with new routers - change (operations/puppet)

2013-10-15 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fixing rancid file with new routers
..


fixing rancid file with new routers

Change-Id: I52645805804caed7c29c8ec72aead1279467e8fc
---
M files/misc/rancid/core/router.db
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/files/misc/rancid/core/router.db b/files/misc/rancid/core/router.db
index 98e5cdc..ba7a843 100644
--- a/files/misc/rancid/core/router.db
+++ b/files/misc/rancid/core/router.db
@@ -2,7 +2,7 @@
 cr2-pmtpa.wikimedia.org:juniper:up:
 csw5-pmtpa.wikimedia.org:foundry:down:
 csw1-sdtpa.wikimedia.org:foundry:up:
-csw1-esams.wikimedia.org:foundry:up:
+csw1-esams.wikimedia.org:foundry:down:
 br1-knams.wikimedia.org:foundry:down:
 asw-d1-sdtpa.mgmt.pmtpa.wmnet:foundry:up:
 asw-a4-sdtpa.mgmt.pmtpa.wmnet:foundry:up:
@@ -30,3 +30,5 @@
 msw2-pmtpa.mgmt.pmtpa.wmnet:juniper:up:
 msw2-sdtpa.mgmt.pmtpa.wmnet:juniper:up:
 pfw1-eqiad.wikimedia.org:juniper:up:
+cr1-ulsfo.wikimedia.org:juniper:up:
+cr2-ulsfo.wikimedia.org:juniper:up:

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

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

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

[MediaWiki-commits] [Gerrit] fixing rancid file with new routers - change (operations/puppet)

2013-10-15 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: fixing rancid file with new routers
..

fixing rancid file with new routers

Change-Id: I52645805804caed7c29c8ec72aead1279467e8fc
---
M files/misc/rancid/core/router.db
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/89808/1

diff --git a/files/misc/rancid/core/router.db b/files/misc/rancid/core/router.db
index 98e5cdc..ba7a843 100644
--- a/files/misc/rancid/core/router.db
+++ b/files/misc/rancid/core/router.db
@@ -2,7 +2,7 @@
 cr2-pmtpa.wikimedia.org:juniper:up:
 csw5-pmtpa.wikimedia.org:foundry:down:
 csw1-sdtpa.wikimedia.org:foundry:up:
-csw1-esams.wikimedia.org:foundry:up:
+csw1-esams.wikimedia.org:foundry:down:
 br1-knams.wikimedia.org:foundry:down:
 asw-d1-sdtpa.mgmt.pmtpa.wmnet:foundry:up:
 asw-a4-sdtpa.mgmt.pmtpa.wmnet:foundry:up:
@@ -30,3 +30,5 @@
 msw2-pmtpa.mgmt.pmtpa.wmnet:juniper:up:
 msw2-sdtpa.mgmt.pmtpa.wmnet:juniper:up:
 pfw1-eqiad.wikimedia.org:juniper:up:
+cr1-ulsfo.wikimedia.org:juniper:up:
+cr2-ulsfo.wikimedia.org:juniper:up:

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

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

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

[MediaWiki-commits] [Gerrit] adding dickson's ipv6 address and renaming it's rdns to .fre... - change (operations/dns)

2013-10-14 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding dickson's ipv6 address and renaming it's rdns to 
.freenode.net.
..


adding dickson's ipv6 address and renaming it's rdns to .freenode.net.

Change-Id: Ie553b7151683df1172d8733b262418124b3bb235
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/155.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 273337d..4330b63 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -71,6 +71,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1052.eqiad.wmnet.
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr1-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr2-eqiad.wikimedia.org.
+8.6.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR   dickson.freenode.net.
 
 ; private1-a-eqiad (2620:0:861:101::/64)
 $ORIGIN 1.0.1.0.{{ zonename }}.
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index 2d462cb..deda636 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -46,6 +46,6 @@
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
 66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
 67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
-68 1H IN PTR   dickson.wikimedia.org.
+68 1H IN PTR   dickson.freenode.net.
 
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3fb8078..1d4a879 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -137,6 +137,7 @@
 dataset10011H  IN A208.80.154.11
 db61   1H  IN A208.80.152.231
 dickson1H  IN A208.80.155.68
+   1H  IN  2620:0:861:52:208:80:155:68
 dobson 1H  IN A208.80.152.173
 ekrem  1H  IN A208.80.152.178
 emery  1H  IN A208.80.152.184

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie553b7151683df1172d8733b262418124b3bb235
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding dickson's ipv6 address and renaming it's rdns to .fre... - change (operations/dns)

2013-10-14 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding dickson's ipv6 address and renaming it's rdns to 
.freenode.net.
..

adding dickson's ipv6 address and renaming it's rdns to .freenode.net.

Change-Id: Ie553b7151683df1172d8733b262418124b3bb235
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/155.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/97/89697/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 273337d..4330b63 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -71,6 +71,7 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1052.eqiad.wmnet.
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr1-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr2-eqiad.wikimedia.org.
+8.6.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR   dickson.freenode.net.
 
 ; private1-a-eqiad (2620:0:861:101::/64)
 $ORIGIN 1.0.1.0.{{ zonename }}.
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index 2d462cb..deda636 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -46,6 +46,6 @@
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
 66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
 67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
-68 1H IN PTR   dickson.wikimedia.org.
+68 1H IN PTR   dickson.freenode.net.
 
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3fb8078..1d4a879 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -137,6 +137,7 @@
 dataset10011H  IN A208.80.154.11
 db61   1H  IN A208.80.152.231
 dickson1H  IN A208.80.155.68
+   1H  IN  2620:0:861:52:208:80:155:68
 dobson 1H  IN A208.80.152.173
 ekrem  1H  IN A208.80.152.178
 emery  1H  IN A208.80.152.184

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie553b7151683df1172d8733b262418124b3bb235
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding ulsfo into snmp allow list - change (operations/puppet)

2013-10-09 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding ulsfo into snmp allow list
..


adding ulsfo into snmp allow list

Change-Id: I75308b128fb49a2f846ee5a92ee2c984a171b5d8
---
M manifests/misc/icinga.pp
1 file changed, 14 insertions(+), 12 deletions(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 1638e3f..d06aa84 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -629,18 +629,20 @@
 
 require 'icinga::monitor::firewall::iptables-purges'
 
-iptables_add_service{ 'lo_all': interface => 'lo', service => 'all', jump 
=> 'ACCEPT' }
-iptables_add_service{ 'localhost_all': source => '127.0.0.1', service => 
'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_pmtpa_nolabs': source => '10.0.0.0/14', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_esams': source => '10.21.0.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad1': source => '10.64.0.0/17', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad2': source => '10.65.0.0/20', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_virt': source => '10.4.16.0/24', service => 
'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_152': source => '208.80.152.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_153': source => '208.80.153.128/26', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_154': source => '208.80.154.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_fundraising': source => '208.80.155.0/27', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_esams': source => '91.198.174.0/25', service 
=> 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'lo_all': interface=> 'lo', service  
  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'localhost_all': source=> '127.0.0.1', 
service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_pmtpa_nolabs': source => '10.0.0.0/14', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_esams': source=> '10.21.0.0/24', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_eqiad1': source   => '10.64.0.0/17', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_eqiad2': source   => '10.65.0.0/20', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_ulsfo': source=> '10.128.0.0/17', 
service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_virt': source => '10.4.16.0/24', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_152': source   => '208.80.152.0/24', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_153': source   => 
'208.80.153.128/26', service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_154': source   => '208.80.154.0/24', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_fundraising': source   => '208.80.155.0/27', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_esams': source => '91.198.174.0/25', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_ulsfo': source => '198.35.26.0/23', 
service=> 'all', jump => 'ACCEPT'}
   }
 
   class iptables-drops {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75308b128fb49a2f846ee5a92ee2c984a171b5d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding ulsfo into snmp allow list - change (operations/puppet)

2013-10-09 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding ulsfo into snmp allow list
..

adding ulsfo into snmp allow list

Change-Id: I75308b128fb49a2f846ee5a92ee2c984a171b5d8
---
M manifests/misc/icinga.pp
1 file changed, 14 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/88891/1

diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 498e793..335db20 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -628,18 +628,20 @@
 
 require 'icinga::monitor::firewall::iptables-purges'
 
-iptables_add_service{ 'lo_all': interface => 'lo', service => 'all', jump 
=> 'ACCEPT' }
-iptables_add_service{ 'localhost_all': source => '127.0.0.1', service => 
'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_pmtpa_nolabs': source => '10.0.0.0/14', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_esams': source => '10.21.0.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad1': source => '10.64.0.0/17', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad2': source => '10.65.0.0/20', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_virt': source => '10.4.16.0/24', service => 
'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_152': source => '208.80.152.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_153': source => '208.80.153.128/26', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_154': source => '208.80.154.0/24', service 
=> 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_fundraising': source => '208.80.155.0/27', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_esams': source => '91.198.174.0/25', service 
=> 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'lo_all': interface=> 'lo', service  
  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'localhost_all': source=> '127.0.0.1', 
service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_pmtpa_nolabs': source => '10.0.0.0/14', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_esams': source=> '10.21.0.0/24', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_eqiad1': source   => '10.64.0.0/17', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_eqiad2': source   => '10.65.0.0/20', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_ulsfo': source=> '10.128.0.0/17', 
service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'private_virt': source => '10.4.16.0/24', 
service  => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_152': source   => '208.80.152.0/24', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_153': source   => 
'208.80.153.128/26', service => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_154': source   => '208.80.154.0/24', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_fundraising': source   => '208.80.155.0/27', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_esams': source => '91.198.174.0/25', 
service   => 'all', jump => 'ACCEPT' }
+iptables_add_service{ 'public_ulsfo': source => '198.35.26.0/23', 
service=> 'all', jump => 'ACCEPT'}
   }
 
   class iptables-drops {

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

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

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

[MediaWiki-commits] [Gerrit] search-pool5 was in twice - change (operations/puppet)

2013-10-03 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: search-pool5 was in twice
..


search-pool5 was in twice

Change-Id: Iadcd664abc9e802efb5b4896974b8dda033441ed
---
M manifests/lvs.pp
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 4490232..2767e5c 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -372,10 +372,6 @@
'pmtpa' => "10.2.1.14",
'eqiad' => "10.2.2.14",
},
-   'search_pool5' => {
-   'pmtpa' => "10.2.1.16",
-   'eqiad' => "10.2.2.16",
-   },
'search_prefix' => {
'pmtpa' => "10.2.1.15",
'eqiad' => "10.2.2.15",

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

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

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

[MediaWiki-commits] [Gerrit] giving search-pool5 proper dns - change (operations/dns)

2013-10-03 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: giving search-pool5 proper dns
..


giving search-pool5 proper dns

Change-Id: I2e8e2a83a400d94eb4c41f1d2e9fd64b1e9108c9
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 73f7d1a..e7dc0da 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1327,6 +1327,7 @@
 13  1H  IN PTR  search-pool3.svc.eqiad.wmnet.
 14  1H  IN PTR  search-pool4.svc.eqiad.wmnet.
 15  1H  IN PTR  search-prefix.svc.eqiad.wmnet.
+16 1H  IN PTR  search-pool5.svc.eqiad.wmnet.
 
 21  1H  IN PTR  rendering.svc.eqiad.wmnet.
 22  1H  IN PTR  api.svc.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 9e05b79..b545ad7 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3073,6 +3073,7 @@
 search-pool3   1H  IN A10.2.2.13
 search-pool4   1H  IN A10.2.2.14
 search-prefix  1H  IN A10.2.2.15
+search-pool5   1H  IN A10.2.2.16
 rendering  1H  IN A10.2.2.21
 api1H  IN A10.2.2.22
 bits   1H  IN A10.2.2.23

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e8e2a83a400d94eb4c41f1d2e9fd64b1e9108c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] search-pool5 was in twice - change (operations/puppet)

2013-10-03 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: search-pool5 was in twice
..

search-pool5 was in twice

Change-Id: Iadcd664abc9e802efb5b4896974b8dda033441ed
---
M manifests/lvs.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/87464/1

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 4490232..2767e5c 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -372,10 +372,6 @@
'pmtpa' => "10.2.1.14",
'eqiad' => "10.2.2.14",
},
-   'search_pool5' => {
-   'pmtpa' => "10.2.1.16",
-   'eqiad' => "10.2.2.16",
-   },
'search_prefix' => {
'pmtpa' => "10.2.1.15",
'eqiad' => "10.2.2.15",

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

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

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

[MediaWiki-commits] [Gerrit] giving search-pool5 proper dns - change (operations/dns)

2013-10-03 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: giving search-pool5 proper dns
..

giving search-pool5 proper dns

Change-Id: I2e8e2a83a400d94eb4c41f1d2e9fd64b1e9108c9
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/62/87462/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 73f7d1a..e7dc0da 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1327,6 +1327,7 @@
 13  1H  IN PTR  search-pool3.svc.eqiad.wmnet.
 14  1H  IN PTR  search-pool4.svc.eqiad.wmnet.
 15  1H  IN PTR  search-prefix.svc.eqiad.wmnet.
+16 1H  IN PTR  search-pool5.svc.eqiad.wmnet.
 
 21  1H  IN PTR  rendering.svc.eqiad.wmnet.
 22  1H  IN PTR  api.svc.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 9e05b79..b545ad7 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3073,6 +3073,7 @@
 search-pool3   1H  IN A10.2.2.13
 search-pool4   1H  IN A10.2.2.14
 search-prefix  1H  IN A10.2.2.15
+search-pool5   1H  IN A10.2.2.16
 rendering  1H  IN A10.2.2.21
 api1H  IN A10.2.2.22
 bits   1H  IN A10.2.2.23

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e8e2a83a400d94eb4c41f1d2e9fd64b1e9108c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] Add service IP addresses for new search - change (operations/dns)

2013-10-01 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Add service IP addresses for new search
..


Add service IP addresses for new search

RT: 5867
Change-Id: I7c749e64b1b101f8e97d23cc347a313aec35a135
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 1034a4e..73f7d1a 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1337,6 +1337,7 @@
 27 1H  IN PTR  ms-fe.svc.eqiad.wmnet.
 28 1H  IN PTR  parsoid.svc.eqiad.wmnet.
 29 1H  IN PTR  parsoidcache.svc.eqiad.wmnet.
+30 1H  IN PTR  search.svc.eqiad.wmnet.
 
 ; esams svc ips
 
diff --git a/templates/wmnet b/templates/wmnet
index 5c9298a..9e05b79 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3082,6 +3082,7 @@
 ms-fe  1H  IN A10.2.2.27
 parsoid1H  IN A10.2.2.28
 parsoidcache   1H  IN A10.2.2.29
+search 1H  IN A10.2.2.30
 
 ; ESAMS SERVICES
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c749e64b1b101f8e97d23cc347a313aec35a135
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add LVS setup for new search infrastructure with monitoring - change (operations/puppet)

2013-10-01 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Add LVS setup for new search infrastructure with monitoring
..


Add LVS setup for new search infrastructure with monitoring

RT: 5867
Change-Id: I9bbb00a11ac9bc5cfc36ccafad700dcee5296b89
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 23 insertions(+), 1 deletion(-)

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



diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 2721038..4490232 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -415,6 +415,9 @@
'parsoidcache' => {
'eqiad' => "10.2.2.29",
},
+   'search' => {
+   'eqiad' => "10.2.2.30",
+   },
},
'labs' => {
'text' => {
@@ -465,6 +468,7 @@
},
'parsoid' => {},
'parsoidcache' => {},
+   'search' => {},
}
}
 
@@ -830,6 +834,21 @@
'IdleConnection' => 
$idleconnection_monitor_options,
},
},
+   "search" => {
+   'description' => "Elasticsearch search for MediaWiki",
+   'class' => "low-traffic",
+   'sites' => [ "eqiad" ],
+   'ip' => $service_ips['search'][$::site],
+   'port' => 9200,
+   'bgp' => "yes",
+   'depool-threshold' => ".5",
+   'monitors' => {
+   'ProxyFetch' => {
+   'url' => [ 'http://localhost:9200/' ],
+   },
+   'IdleConnection' => 
$idleconnection_monitor_options,
+   },
+   },
}
 }
 
@@ -1019,6 +1038,7 @@
 #  monitor_service_lvs_http { "ms-fe.eqiad.wmnet": ip_address => 
"10.2.2.27", check_command => 
"check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "parsoid.svc.eqiad.wmnet": ip_address => 
"10.2.2.28", check_command => "check_http_on_port!8000", contact_group => 
"admins,parsoid" }
monitor_service_lvs_http { "parsoidcache.svc.eqiad.wmnet": ip_address 
=> "10.2.2.29", check_command => "check_http_lvs!parsoid!/", contact_group => 
"admins,parsoid" }
+   monitor_service_lvs_http { "search.svc.eqiad.wmnet": ip_address => 
"10.2.2.30", check_command => "check_http_on_port!9200", contact_group => 
"admins" }
 
monitor_service_lvs_custom { "search-pool1.svc.pmtpa.wmnet": ip_address 
=> "10.2.1.11", port => 8123, description => "LVS Lucene", check_command => 
"check_lucene" }
monitor_service_lvs_custom { "search-pool2.svc.pmtpa.wmnet": ip_address 
=> "10.2.1.12", port => 8123, description => "LVS Lucene", check_command => 
"check_lucene" }
diff --git a/manifests/site.pp b/manifests/site.pp
index 0b2ee80..a412262 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1521,7 +1521,8 @@
 $sip['search_prefix'][$::site],
 $sip['swift'][$::site],
 $sip['parsoid'][$::site],
-$sip['parsoidcache'][$::site]
+$sip['parsoidcache'][$::site],
+$sip['search'][$::site]
 ]
 }
 
@@ -2837,6 +2838,7 @@
 
 include standard
 include role::elasticsearch::production
+class { "lvs::realserver": realserver_ips => [ "10.2.2.30" ] }
 }
 
 node "tin.eqiad.wmnet" {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bbb00a11ac9bc5cfc36ccafad700dcee5296b89
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] moved the LVS subnet for ulsfo - change (operations/dns)

2013-09-27 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: moved the LVS subnet for ulsfo
..


moved the LVS subnet for ulsfo

Change-Id: Ic4de6331fa6dff5a2ede3cd93c80b28b3fd6b614
---
M templates/26.35.198.in-addr.arpa
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index fe72568..761cc5e 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -17,10 +17,13 @@
 ; 198.35.26.0/23 (198.35.26.0 - 198.35.27.255)
 ; West Coast Discrete network
 
-; 198.35.26.0/28 (198.35.26.0 - 192.35.26.63)
+; 198.35.26.0/28 (198.35.26.0 - 198.35.26.63)
 ; ulsfo public IP space
 
 5  1H IN PTR   bast4001.wikimedia.org.
+
+; 198.35.26.96/27 (198.35.26.96 - 198.35.26.127)
+; LVS service IPs
 
 ; 198.35.26.192/27
 ; Infrastructure Space
@@ -51,5 +54,3 @@
 2101H IN PTR   lt-0-0-0-0.cr2-ulsfo.wikimedia.org.
 2111H IN PTR   lt-0-0-0-1.br2-ulsfo.wikimedia.org.
 
-; 198.35.26.224/27
-; LVS service IPs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4de6331fa6dff5a2ede3cd93c80b28b3fd6b614
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] moved the LVS subnet for ulsfo - change (operations/dns)

2013-09-27 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: moved the LVS subnet for ulsfo
..

moved the LVS subnet for ulsfo

Change-Id: Ic4de6331fa6dff5a2ede3cd93c80b28b3fd6b614
---
M templates/26.35.198.in-addr.arpa
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/66/86266/1

diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index fe72568..8140007 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -22,6 +22,9 @@
 
 5  1H IN PTR   bast4001.wikimedia.org.
 
+; 198.35.26.96/27
+; LVS service IPs
+
 ; 198.35.26.192/27
 ; Infrastructure Space
 
@@ -51,5 +54,3 @@
 2101H IN PTR   lt-0-0-0-0.cr2-ulsfo.wikimedia.org.
 2111H IN PTR   lt-0-0-0-1.br2-ulsfo.wikimedia.org.
 
-; 198.35.26.224/27
-; LVS service IPs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4de6331fa6dff5a2ede3cd93c80b28b3fd6b614
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] Adding entries for new ulsfo lvs4* and cp4* hosts. - change (operations/dns)

2013-09-26 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Adding entries for new ulsfo lvs4* and cp4* hosts.
..


Adding entries for new ulsfo lvs4* and cp4* hosts.

Change-Id: Iffafa23edd051823399707d4c0832e7dd0b6f813
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 62 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 2152ab4..b536b6d 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3420,6 +3420,34 @@
 1191H  IN PTR  cp4019.mgmt.ulsfo.wmnet.
 1201H  IN PTR  cp4020.mgmt.ulsfo.wmnet.
 
+; 10.128.0.0/24 - private1-ulsfo
+$ORIGIN 0.128.{{ zonename }}.
+11 1H  IN PTR  lvs4001.ulsfo.wmnet.
+12 1H  IN PTR  lvs4002.ulsfo.wmnet.
+13 1H  IN PTR  lvs4003.ulsfo.wmnet.
+14 1H  IN PTR  lvs4004.ulsfo.wmnet.
+
+1011H  IN PTR  cp4001.ulsfo.wmnet.
+1021H  IN PTR  cp4002.ulsfo.wmnet.
+1031H  IN PTR  cp4003.ulsfo.wmnet.
+1041H  IN PTR  cp4004.ulsfo.wmnet.
+1051H  IN PTR  cp4005.ulsfo.wmnet.
+1061H  IN PTR  cp4006.ulsfo.wmnet.
+1071H  IN PTR  cp4007.ulsfo.wmnet.
+1081H  IN PTR  cp4008.ulsfo.wmnet.
+1091H  IN PTR  cp4009.ulsfo.wmnet.
+1101H  IN PTR  cp4010.ulsfo.wmnet.
+1111H  IN PTR  cp4011.ulsfo.wmnet.
+1121H  IN PTR  cp4012.ulsfo.wmnet.
+1131H  IN PTR  cp4013.ulsfo.wmnet.
+1141H  IN PTR  cp4014.ulsfo.wmnet.
+1151H  IN PTR  cp4015.ulsfo.wmnet.
+1161H  IN PTR  cp4016.ulsfo.wmnet.
+1171H  IN PTR  cp4017.ulsfo.wmnet.
+1181H  IN PTR  cp4018.ulsfo.wmnet.
+1191H  IN PTR  cp4019.ulsfo.wmnet.
+1201H  IN PTR  cp4020.ulsfo.wmnet.
+
 
 ; LEGACY
 
diff --git a/templates/wmnet b/templates/wmnet
index 1b8dbc6..6f11352 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3008,6 +3008,40 @@
 cp4019 1H  IN A10.128.129.119
 cp4020 1H  IN A10.128.129.120
 
+
+;
+; ULSFO private1
+;
+
+$ORIGIN ulsfo.wmnet.
+
+; Servers listed sequentially
+lvs40011H  IN A10.128.0.11
+lvs40021H  IN A10.128.0.12
+lvs40031H  IN A10.128.0.13
+lvs40041H  IN A10.128.0.14
+
+cp4001 1H  IN A10.128.0.101
+cp4002 1H  IN A10.128.0.102
+cp4003 1H  IN A10.128.0.103
+cp4004 1H  IN A10.128.0.104
+cp4005 1H  IN A10.128.0.105
+cp4006 1H  IN A10.128.0.106
+cp4007 1H  IN A10.128.0.107
+cp4008 1H  IN A10.128.0.108
+cp4009 1H  IN A10.128.0.109
+cp4010 1H  IN A10.128.0.110
+cp4011 1H  IN A10.128.0.111
+cp4012 1H  IN A10.128.0.112
+cp4013 1H  IN A10.128.0.113
+cp4014 1H  IN A10.128.0.114
+cp4015 1H  IN A10.128.0.115
+cp4016 1H  IN A10.128.0.116
+cp4017 1H  IN A10.128.0.117
+cp4018 1H  IN A10.128.0.118
+cp4019 1H  IN A10.128.0.119
+cp4020 1H  IN A10.128.0.120
+
 ;
 ; SERVICES
 ;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffafa23edd051823399707d4c0832e7dd0b6f813
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Akosiaris 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding ulsfo ip information - change (operations/puppet)

2013-09-24 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding ulsfo ip information
..


adding ulsfo ip information

Change-Id: I6b941dbe3ac13bce57122f3e70b6369a4c646326
---
M manifests/realm.pp
1 file changed, 9 insertions(+), 7 deletions(-)

Approvals:
  Lcarr: Looks good to me, approved
  RobH: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/realm.pp b/manifests/realm.pp
index 7c31dad..ede1cdc 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -15,7 +15,7 @@
 }
 
 # TODO: redo this in a much better way
-$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24" ]
+$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24", "198.35.26.0/23", 
"185.15.56.0/22" ]
 
 # Determine the site the server is in
 if $::ipaddress_eth0 != undef {
@@ -27,12 +27,14 @@
 }
 
 $site = $main_ipaddress ? {
-   /^208\.80\.15[23]\./=> "pmtpa",
-   /^208\.80\.15[45]\./=> "eqiad",
-   /^10\.[0-4]\./  => "pmtpa",
-   /^10\.6[48]\./  => "eqiad",
-   /^91\.198\.174\./   => "esams",
-   default => "(undefined)"
+   /^208\.80\.15[23]\./  => "pmtpa",
+   /^208\.80\.15[45]\./  => "eqiad",
+   /^10\.[0-4]\./=> "pmtpa",
+   /^10\.6[48]\./=> "eqiad",
+   /^91\.198\.174\./ => "esams",
+   /^198\.35\.26\.([0-9]|[1-5][0-9]|6[0-2])/ => "ulsfo",
+   /^10\.128\./  => "ulsfo",
+   default   => "(undefined)"
 }
 
 $mw_primary = $::realm ? {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b941dbe3ac13bce57122f3e70b6369a4c646326
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding ulsfo ip information - change (operations/puppet)

2013-09-24 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding ulsfo ip information
..

adding ulsfo ip information

Change-Id: I6b941dbe3ac13bce57122f3e70b6369a4c646326
---
M manifests/realm.pp
1 file changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/85911/1

diff --git a/manifests/realm.pp b/manifests/realm.pp
index 7c31dad..ede1cdc 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -15,7 +15,7 @@
 }
 
 # TODO: redo this in a much better way
-$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24" ]
+$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24", "198.35.26.0/23", 
"185.15.56.0/22" ]
 
 # Determine the site the server is in
 if $::ipaddress_eth0 != undef {
@@ -27,12 +27,14 @@
 }
 
 $site = $main_ipaddress ? {
-   /^208\.80\.15[23]\./=> "pmtpa",
-   /^208\.80\.15[45]\./=> "eqiad",
-   /^10\.[0-4]\./  => "pmtpa",
-   /^10\.6[48]\./  => "eqiad",
-   /^91\.198\.174\./   => "esams",
-   default => "(undefined)"
+   /^208\.80\.15[23]\./  => "pmtpa",
+   /^208\.80\.15[45]\./  => "eqiad",
+   /^10\.[0-4]\./=> "pmtpa",
+   /^10\.6[48]\./=> "eqiad",
+   /^91\.198\.174\./ => "esams",
+   /^198\.35\.26\.([0-9]|[1-5][0-9]|6[0-2])/ => "ulsfo",
+   /^10\.128\./  => "ulsfo",
+   default   => "(undefined)"
 }
 
 $mw_primary = $::realm ? {

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

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

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

[MediaWiki-commits] [Gerrit] adding ulsfo in ganglia options - change (operations/puppet)

2013-09-24 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding ulsfo in ganglia options
..


adding ulsfo in ganglia options

Change-Id: Ia17a1ba30d7820ff9215e811cd8e1aa1b7638966
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 4e74f16..8ab6fda 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -54,6 +54,7 @@
 "pmtpa" => "239.192.0",
 "eqiad" => "239.192.1",
 "esams" => "239.192.20",
+"ulsfo" => "239.192.10"
 }
 
 $name_suffix = " ${::site}"

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

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

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

[MediaWiki-commits] [Gerrit] adding ulsfo in ganglia options - change (operations/puppet)

2013-09-24 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding ulsfo in ganglia options
..

adding ulsfo in ganglia options

Change-Id: Ia17a1ba30d7820ff9215e811cd8e1aa1b7638966
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/85907/1

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 4e74f16..8ab6fda 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -54,6 +54,7 @@
 "pmtpa" => "239.192.0",
 "eqiad" => "239.192.1",
 "esams" => "239.192.20",
+"ulsfo" => "239.192.10"
 }
 
 $name_suffix = " ${::site}"

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

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

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

[MediaWiki-commits] [Gerrit] analytics1003 and analytics1004 now have public IPs. - change (operations/puppet)

2013-09-24 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: analytics1003 and analytics1004 now have public IPs.
..


analytics1003 and analytics1004 now have public IPs.

See: operations/dns change at https://gerrit.wikimedia.org/r/#/c/85878/

Change-Id: I9304d7334d9ebd821704eaacad923a156527a180
---
M files/dhcpd/linux-host-entries.ttyS0-115200
M manifests/decommissioning.pp
M manifests/site.pp
3 files changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/files/dhcpd/linux-host-entries.ttyS0-115200 
b/files/dhcpd/linux-host-entries.ttyS0-115200
index 6c8f993..74d30ac 100644
--- a/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -15,12 +15,12 @@
 
 host analytics1003 {
hardware ethernet 88:43:e1:c2:99:48;
-   fixed-address analytics1003.eqiad.wmnet;
+   fixed-address analytics1003.wikimedia.org;
 }
 
 host analytics1004 {
hardware ethernet 88:43:e1:c2:86:94;
-   fixed-address analytics1004.eqiad.wmnet;
+   fixed-address analytics1004.wikimedia.org;
 }
 
 host analytics1005 {
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 60ed984..a411a5e 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -4,8 +4,6 @@
 
 $decommissioned_servers = [
 'adler',
-'analytics1003',
-'analytics1004',
 'arsenic',
 'barium',
 'bayes',
diff --git a/manifests/site.pp b/manifests/site.pp
index b043bbf..2ef92ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -130,6 +130,12 @@
 include role::analytics
 }
 
+# analytics1003 and analytics1004 are temporarily
+# test Kafka Brokers.
+node /analytics100[34]\.wikimedia\.org/ {
+include role::analytics
+}
+
 # Unassigned Cisco nodes.
 # NOTE:  analytics1002 still need reinstalled as of 2013-08-26
 node /analytics100[2568]\.eqiad\.wmnet/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9304d7334d9ebd821704eaacad923a156527a180
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] updating rdns for dickson temporarily - change (operations/dns)

2013-09-20 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: updating rdns for dickson temporarily
..

updating rdns for dickson temporarily

Change-Id: I827b14202fc16c022e85056f8c86617d6b0030c8
---
M templates/155.80.208.in-addr.arpa
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/45/85345/1

diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index deda636..2d462cb 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -46,6 +46,6 @@
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
 66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
 67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
-68 1H IN PTR   dickson.freenode.net.
+68 1H IN PTR   dickson.wikimedia.org.
 
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I827b14202fc16c022e85056f8c86617d6b0030c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] adding subnet sandbox1-b-eqiad and dickson.freenode.net fixe... - change (operations/dns)

2013-09-20 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding subnet sandbox1-b-eqiad and dickson.freenode.net fixed 
to include ipv6
..


adding subnet sandbox1-b-eqiad and dickson.freenode.net
fixed to include ipv6

Change-Id: I65dda1e66180b9f852dfac282a9f5fe4c567ce6a
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/155.80.208.in-addr.arpa
2 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 5465681..273337d 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -66,6 +66,12 @@
 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR   ssl1006.wikimedia.org.
 7.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   ssl1009.wikimedia.org.
 
+; sandbox1-b-eqiad (2620:0:861:52::/64
+$ORIGIN 52.0.0.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1052.eqiad.wmnet.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   
ae2-1052.cr2-eqiad.wikimedia.org.
+
 ; private1-a-eqiad (2620:0:861:101::/64)
 $ORIGIN 1.0.1.0.{{ zonename }}.
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1017.eqiad.wmnet.
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index f581280..deda636 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -41,4 +41,11 @@
 36 1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37 1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
+;208.80.155.64/26 Sandbox subnet
+;208.80.155.64/28 Sandbox1-b-eqiad subnet
+65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
+66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
+67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
+68 1H IN PTR   dickson.freenode.net.
+
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65dda1e66180b9f852dfac282a9f5fe4c567ce6a
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] updating rdns for dickson temporarily - change (operations/dns)

2013-09-20 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: updating rdns for dickson temporarily
..


updating rdns for dickson temporarily

Change-Id: I827b14202fc16c022e85056f8c86617d6b0030c8
---
M templates/155.80.208.in-addr.arpa
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index deda636..2d462cb 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -46,6 +46,6 @@
 65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
 66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
 67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
-68 1H IN PTR   dickson.freenode.net.
+68 1H IN PTR   dickson.wikimedia.org.
 
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I827b14202fc16c022e85056f8c86617d6b0030c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Rename manganese -> dickson and prep for debian - change (operations/puppet)

2013-09-20 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: Rename manganese -> dickson and prep for debian
..


Rename manganese -> dickson and prep for debian

This is the server that will host our freenode IRC server.
Also, add dhcp subnet for the sanbox in eqiad.

Change-Id: Ic605856d176a070c8b89136fa442a385a1829ce0
---
M files/autoinstall/netboot.cfg
A files/autoinstall/subnets/sandbox1-b-eqiad.cfg
M files/dhcpd/dhcpd.conf
M files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 37 insertions(+), 5 deletions(-)

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



diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index f978154..6f9f2c9 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -18,6 +18,7 @@
10.4.16.255) echo subnets/pmtpa-virt.cfg ;; \
208.80.154.63) echo subnets/public1-a-eqiad.cfg ;; \
208.80.154.191) echo subnets/public1-b-eqiad.cfg ;; \
+   208.80.155.79) echo subnets/sandbox1-b-eqiad.cfg ;; \
10.64.3.255) echo subnets/private1-a-eqiad.cfg ;; \
10.64.19.255) echo subnets/private1-b-eqiad.cfg ;; \
10.64.35.255) echo subnets/private1-c-eqiad.cfg ;; \
diff --git a/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 
b/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
new file mode 100644
index 000..3ad2e70
--- /dev/null
+++ b/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
@@ -0,0 +1,17 @@
+# subnet specific configuration settings
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+d-inetcfg/get_domain   string  wikimedia.org
+
+# disable_dhcp for lucid, disable_autoconfig for >= precise
+d-inetcfg/disable_dhcp boolean true
+d-inetcfg/disable_autoconfig   boolean true
+
+# ip address is taken from DHCP, rest is set here
+d-inetcfg/get_netmask  string  255.255.255.240
+d-inetcfg/get_gateway  string  208.80.155.65
+d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
+d-inetcfg/confirm_static   boolean true
+
+# NTP
+d-iclock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git a/files/dhcpd/dhcpd.conf b/files/dhcpd/dhcpd.conf
index 8b3fb5c..8d5e929 100644
--- a/files/dhcpd/dhcpd.conf
+++ b/files/dhcpd/dhcpd.conf
@@ -148,6 +148,18 @@
next-server 208.80.154.10; # carbon (tftp server)
 }
 
+# sanbox1-b-eqiad
+subnet 208.80.155.64 netmask 255.255.255.240 {
+   authoritative;
+
+   option subnet-mast 255.255.255.240;
+   option broadcast-address 208.80.155.79;
+   option routers 208.80.155.65;
+   option domain-name "wikimedia.org";
+
+   next-server 208.80.154.10; # carbon (tftp server)
+}
+
 # private1-a-eqiad
 subnet 10.64.0.0 netmask 255.255.252.0 {
authoritative;
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 8e884db..1758d9b 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1236,6 +1236,13 @@
fixed-address db1060.eqiad.wmnet;
 }
 
+host dickson {
+   hardware ethernet 78:2b:cb:09:0c:5a;
+   fixed-address dickson.wikimedia.org;
+   option pxelinux.pathprefix "debian-installer/";
+   filename "debian-installer/amd64/pxelinux.0";
+}
+
 host dysprosium {
hardware ethernet 90:B1:1C:3B:C7:2C;
fixed-address dysprosium.eqiad.wmnet;
@@ -1523,11 +1530,6 @@
 host maerlant {
hardware ethernet a4:ba:db:30:d1:12;
fixed-address maerlant.esams.wikimedia.org;
-}
-
-host manganese {
-   hardware ethernet 78:2b:cb:09:0c:5a;
-   fixed-address manganese.wikimedia.org;
 }
 
 host magnesium {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic605856d176a070c8b89136fa442a385a1829ce0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding subnet sandbox1-b-eqiad and dickson.freenode.net - change (operations/dns)

2013-09-20 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding subnet sandbox1-b-eqiad and dickson.freenode.net
..

adding subnet sandbox1-b-eqiad and dickson.freenode.net

Change-Id: I65dda1e66180b9f852dfac282a9f5fe4c567ce6a
---
M templates/155.80.208.in-addr.arpa
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/50/85250/1

diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index f581280..deda636 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -41,4 +41,11 @@
 36 1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37 1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
+;208.80.155.64/26 Sandbox subnet
+;208.80.155.64/28 Sandbox1-b-eqiad subnet
+65 1H IN PTR   vrrp-gw-1052.wikimedia.org.
+66 1H IN PTR   ae2-1052.cr1-eqiad.wikimedia.org.
+67 1H IN PTR   ae2-1052.cr2-eqiad.wikimedia.org.
+68 1H IN PTR   dickson.freenode.net.
+
 ; 208.80.155.128/25 Eqiad Labs virtualization subnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65dda1e66180b9f852dfac282a9f5fe4c567ce6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] ZERO: Updated VIVA Bahrain 426_04 IPs - change (operations/puppet)

2013-09-19 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: ZERO: Updated VIVA Bahrain 426_04 IPs
..


ZERO: Updated VIVA Bahrain 426_04 IPs

Change-Id: Ie9936431a020c2f6f01ca915686219fb609a719a
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 4862649..b0fc595 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -359,6 +359,9 @@
 }
 
 acl carrier_426_04 { // VIVA Bahrain
+   "37.131.0.0"/24;
+   "37.131.64.0"/23;
+   "46.184.191.80"/28;
"84.235.101.64"/26;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9936431a020c2f6f01ca915686219fb609a719a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] correcting netboot gateway - change (operations/puppet)

2013-09-18 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: correcting netboot gateway
..


correcting netboot gateway

Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc
---
M files/autoinstall/subnets/public1-ulsfo.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved



diff --git a/files/autoinstall/subnets/public1-ulsfo.cfg 
b/files/autoinstall/subnets/public1-ulsfo.cfg
index 4a0325c..98b6c05 100644
--- a/files/autoinstall/subnets/public1-ulsfo.cfg
+++ b/files/autoinstall/subnets/public1-ulsfo.cfg
@@ -12,7 +12,7 @@
 
 # ip address is taken from DHCP, rest is set here
 d-inetcfg/get_netmask  string  255.255.255.240
-d-inetcfg/get_gateway  string  192.32.26.1
+d-inetcfg/get_gateway  string  198.35.26.1
 d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
 d-inetcfg/confirm_static   boolean true
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 

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

[MediaWiki-commits] [Gerrit] correcting netboot gateway - change (operations/puppet)

2013-09-18 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: correcting netboot gateway
..

correcting netboot gateway

Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc
---
M files/autoinstall/subnets/public1-ulsfo.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/84876/1

diff --git a/files/autoinstall/subnets/public1-ulsfo.cfg 
b/files/autoinstall/subnets/public1-ulsfo.cfg
index 4a0325c..98b6c05 100644
--- a/files/autoinstall/subnets/public1-ulsfo.cfg
+++ b/files/autoinstall/subnets/public1-ulsfo.cfg
@@ -12,7 +12,7 @@
 
 # ip address is taken from DHCP, rest is set here
 d-inetcfg/get_netmask  string  255.255.255.240
-d-inetcfg/get_gateway  string  192.32.26.1
+d-inetcfg/get_gateway  string  198.35.26.1
 d-inetcfg/get_nameservers  string  208.80.152.131 208.80.152.132
 d-inetcfg/confirm_static   boolean true
 

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

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

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

[MediaWiki-commits] [Gerrit] updating apt-proxy ip range and tftp ip range - change (operations/puppet)

2013-09-18 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: updating apt-proxy ip range and tftp ip range
..


updating apt-proxy ip range and tftp ip range

Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4
---
M files/squid/apt-proxy.conf
M manifests/misc/install-server.pp
2 files changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/files/squid/apt-proxy.conf b/files/squid/apt-proxy.conf
index fc74bb2..ab08da9 100644
--- a/files/squid/apt-proxy.conf
+++ b/files/squid/apt-proxy.conf
@@ -2422,12 +2422,9 @@
 
 acl wikimedia src 208.80.152.0/22
 acl wikimedia src 91.198.174.0/24
-acl wikimedia src 198.35.26.0/28
+acl wikimedia src 198.35.26.0/22
 acl wikimedia src 185.15.56.0/22
-acl wikimedia src 10.0.0.0/16
-acl wikimedia src 10.64.0.0/12
-acl wikimedia src 10.4.16.0/24
-acl wikimedia src 10.4.0.0/21
+acl wikimedia src 10.0.0.0/8
 
 #  TAG: follow_x_forwarded_for
 # Note: This option is only available if Squid is rebuilt with the
diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp
index 7cec180..4b02ae1 100644
--- a/manifests/misc/install-server.pp
+++ b/manifests/misc/install-server.pp
@@ -52,6 +52,7 @@
 /sbin/iptables -A tftp -s 10.0.0.0/8 -j ACCEPT;
 /sbin/iptables -A tftp -s 208.80.152.0/22 -j ACCEPT;
 /sbin/iptables -A tftp -s 91.198.174.0/24 -j ACCEPT;
+/sbin/iptables -A tftp -s 198.35.26.0/22 -j ACCEPT;
 /sbin/iptables -A tftp -j DROP;
 /sbin/iptables -I INPUT -p udp --dport tftp -j tftp
 '

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

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

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

[MediaWiki-commits] [Gerrit] updating apt-proxy ip range and tftp ip range - change (operations/puppet)

2013-09-18 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: updating apt-proxy ip range and tftp ip range
..

updating apt-proxy ip range and tftp ip range

Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4
---
M files/squid/apt-proxy.conf
M manifests/misc/install-server.pp
2 files changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/84867/1

diff --git a/files/squid/apt-proxy.conf b/files/squid/apt-proxy.conf
index fc74bb2..ab08da9 100644
--- a/files/squid/apt-proxy.conf
+++ b/files/squid/apt-proxy.conf
@@ -2422,12 +2422,9 @@
 
 acl wikimedia src 208.80.152.0/22
 acl wikimedia src 91.198.174.0/24
-acl wikimedia src 198.35.26.0/28
+acl wikimedia src 198.35.26.0/22
 acl wikimedia src 185.15.56.0/22
-acl wikimedia src 10.0.0.0/16
-acl wikimedia src 10.64.0.0/12
-acl wikimedia src 10.4.16.0/24
-acl wikimedia src 10.4.0.0/21
+acl wikimedia src 10.0.0.0/8
 
 #  TAG: follow_x_forwarded_for
 # Note: This option is only available if Squid is rebuilt with the
diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp
index 7cec180..4b02ae1 100644
--- a/manifests/misc/install-server.pp
+++ b/manifests/misc/install-server.pp
@@ -52,6 +52,7 @@
 /sbin/iptables -A tftp -s 10.0.0.0/8 -j ACCEPT;
 /sbin/iptables -A tftp -s 208.80.152.0/22 -j ACCEPT;
 /sbin/iptables -A tftp -s 91.198.174.0/24 -j ACCEPT;
+/sbin/iptables -A tftp -s 198.35.26.0/22 -j ACCEPT;
 /sbin/iptables -A tftp -j DROP;
 /sbin/iptables -I INPUT -p udp --dport tftp -j tftp
 '

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

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

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

[MediaWiki-commits] [Gerrit] fixing up the ntp ip list - change (operations/puppet)

2013-09-16 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fixing up the ntp ip list
..


fixing up the ntp ip list

Change-Id: I644f4d96cc22b63535b2c98459a947bdfb94169f
---
M modules/ntp/templates/ntp-server.erb
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/ntp/templates/ntp-server.erb 
b/modules/ntp/templates/ntp-server.erb
index b013a5f..1f9b9e1 100644
--- a/modules/ntp/templates/ntp-server.erb
+++ b/modules/ntp/templates/ntp-server.erb
@@ -45,6 +45,9 @@
 restrict 208.80.152.0 mask 255.255.252.0 kod notrap nomodify nopeer
 restrict 91.198.174.0 mask 255.255.255.0 kod notrap nomodify nopeer
 restrict 2620:0:860:: mask :::: kod notrap nomodify nopeer
+restrict 198.35.26.0 mask 255.255.254.0 kod notrap nomodify nopeer
+restrict 185.15.56.0 mask 255.255.252.0 kod notrap nomodify nopeer
+restrict 2a02:ec80:: mask ::: kod notrap nomodify nopeer
 <% else -%>
 # Allow the monitoring server to query us
 # neon

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I644f4d96cc22b63535b2c98459a947bdfb94169f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Jeremyb 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] fixing subnet for public servers - change (operations/dns)

2013-09-16 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: fixing subnet for public servers
..

fixing subnet for public servers

Change-Id: Ie939104318f3e3713c10af8a9e1262ab9060883f
---
M templates/26.35.198.in-addr.arpa
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/62/84362/1

diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 3ad2c82..f6fef78 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -17,7 +17,7 @@
 ; 198.35.26.0/23 (198.35.26.0 - 198.35.27.255)
 ; West Coast Discrete network
 
-; 198.35.26.0/26 (198.35.26.0 - 192.35.26.63)
+; 198.35.26.0/28 (198.35.26.0 - 192.35.26.63)
 ; ulsfo public IP space
 
 5  1H IN PTR   bastion4001.wikimedia.org.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie939104318f3e3713c10af8a9e1262ab9060883f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] fixing subnet for public servers - change (operations/dns)

2013-09-16 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: fixing subnet for public servers
..


fixing subnet for public servers

Change-Id: Ie939104318f3e3713c10af8a9e1262ab9060883f
---
M templates/26.35.198.in-addr.arpa
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 3ad2c82..f6fef78 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -17,7 +17,7 @@
 ; 198.35.26.0/23 (198.35.26.0 - 198.35.27.255)
 ; West Coast Discrete network
 
-; 198.35.26.0/26 (198.35.26.0 - 192.35.26.63)
+; 198.35.26.0/28 (198.35.26.0 - 192.35.26.63)
 ; ulsfo public IP space
 
 5  1H IN PTR   bastion4001.wikimedia.org.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie939104318f3e3713c10af8a9e1262ab9060883f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] added all the new network subnets - change (operations/puppet)

2013-09-12 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: added all the new network subnets
..


added all the new network subnets

Change-Id: Ia6156dc7e99fb93bb0f0ecaab2400f5d6a4e973e
---
M manifests/network.pp
1 file changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/manifests/network.pp b/manifests/network.pp
index eb0ad59..e3e421c 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -1,8 +1,8 @@
 # network.pp
 
 class network::constants {
-   $external_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46" ]
-   $all_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "10.0.0.0/8" ]
+   $external_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "185.15.56.0/22", "198.35.26.0/23", "2a02:ec80::/32" ]
+   $all_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "10.0.0.0/8", "185.15.56.0/22", "198.35.26.0/23", 
"2a02:ec80::/32"  ]
$all_network_subnets = {
'production' => {
'eqiad' => {
@@ -110,6 +110,20 @@
},
},
},
+   'ulsfo' => {
+   'public' => {
+   'public1-ulsfo' => {
+   'ipv4' => "198.35.26.0/27",
+   'ipv6' => "2620:0:863:1::/64"
+   },
+   },
+   'private' => {
+   'private1-ulsfo' => {
+   'ipv4' => "10.128.0.0/24",
+   'ipv6' => "2620:0:863:101::/64"
+   },
+   },
+   },
},
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6156dc7e99fb93bb0f0ecaab2400f5d6a4e973e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adding cr2-ulsfo - change (operations/dns)

2013-09-12 Thread Lcarr (Code Review)

Lcarr has submitted this change and it was merged.

Change subject: adding cr2-ulsfo
..


adding cr2-ulsfo

Change-Id: Ia954c9d13f80406b969f6da438d4eea87ab0a19f
---
M templates/wikimedia.org
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 59f0d20..b0c3828 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -441,6 +441,9 @@
 cr1-ulsfo  1H  IN A198.35.26.192
IN  2620:0:863:::1
 
+cr2-ulsfo  1H  IN A198.35.26.193
+   IN  2620:0:863:::2
+
 cr2-eqiad  1H  IN A208.80.154.197
IN  2620:0:861:::2
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia954c9d13f80406b969f6da438d4eea87ab0a19f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] added all the new network subnets - change (operations/puppet)

2013-09-12 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: added all the new network subnets
..

added all the new network subnets

Change-Id: Ia6156dc7e99fb93bb0f0ecaab2400f5d6a4e973e
---
M manifests/network.pp
1 file changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/84096/1

diff --git a/manifests/network.pp b/manifests/network.pp
index eb0ad59..c434d9e 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -1,8 +1,8 @@
 # network.pp
 
 class network::constants {
-   $external_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46" ]
-   $all_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "10.0.0.0/8" ]
+   $external_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "185.15.56.0/22", "198.35.26.0/23", "2a02:ec80::/32" ]
+   $all_networks = [ "91.198.174.0/24", "208.80.152.0/22", 
"2620:0:860::/46", "10.0.0.0/8", "185.15.56.0/22", "198.35.26.0/23", 
"2a02:ec80::/32"  ]
$all_network_subnets = {
'production' => {
'eqiad' => {
@@ -110,6 +110,18 @@
},
},
},
+   'ulsfo' => {
+   'public' => {
+   'public1-ulsfo' => {
+   'ipv4' => "198.35.26.0/27",
+   'ipv6' => "2620:0:863:1::/64" 
+   },
+   'private1-ulsfo' => {
+   'ipv4' => "10.128.0.0/24",
+   'ipv6' => "2620:0:863:101::/64"
+   },
+   },
+   },
},
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] fixing the ntp server ranges - change (operations/puppet)

2013-09-12 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: fixing the ntp server ranges
..

fixing the ntp server ranges

Change-Id: I644f4d96cc22b63535b2c98459a947bdfb94169f
---
M modules/cdh4
M modules/ntp/templates/ntp-server.erb
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/84091/1

diff --git a/modules/cdh4 b/modules/cdh4
index e55bfa1..5bde42e 16
--- a/modules/cdh4
+++ b/modules/cdh4
-Subproject commit e55bfa10f47a84fa78dee9a540175d503775dc0c
+Subproject commit 5bde42ead8e72fb23a33cb7efd1c90f8b43e746d
diff --git a/modules/ntp/templates/ntp-server.erb 
b/modules/ntp/templates/ntp-server.erb
index b013a5f..1f9b9e1 100644
--- a/modules/ntp/templates/ntp-server.erb
+++ b/modules/ntp/templates/ntp-server.erb
@@ -45,6 +45,9 @@
 restrict 208.80.152.0 mask 255.255.252.0 kod notrap nomodify nopeer
 restrict 91.198.174.0 mask 255.255.255.0 kod notrap nomodify nopeer
 restrict 2620:0:860:: mask :::: kod notrap nomodify nopeer
+restrict 198.35.26.0 mask 255.255.254.0 kod notrap nomodify nopeer
+restrict 185.15.56.0 mask 255.255.252.0 kod notrap nomodify nopeer
+restrict 2a02:ec80:: mask ::: kod notrap nomodify nopeer
 <% else -%>
 # Allow the monitoring server to query us
 # neon

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

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

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

[MediaWiki-commits] [Gerrit] adding cr2-ulsfo - change (operations/dns)

2013-09-12 Thread Lcarr (Code Review)

Lcarr has uploaded a new change for review.

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


Change subject: adding cr2-ulsfo
..

adding cr2-ulsfo

Change-Id: Ia954c9d13f80406b969f6da438d4eea87ab0a19f
---
M templates/wikimedia.org
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/29/84029/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 59f0d20..b0c3828 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -441,6 +441,9 @@
 cr1-ulsfo  1H  IN A198.35.26.192
IN  2620:0:863:::1
 
+cr2-ulsfo  1H  IN A198.35.26.193
+   IN  2620:0:863:::2
+
 cr2-eqiad  1H  IN A208.80.154.197
IN  2620:0:861:::2
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia954c9d13f80406b969f6da438d4eea87ab0a19f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr 

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

1 2 3 4 5 6 >

1 - 100 of 582 matches

Mail list logo