[MediaWiki-commits] [Gerrit] operations/dns[master]: Remove pfw-codfw from DNS

2017-08-08 Thread Ayounsi (Code Review)
Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370661 )

Change subject: Remove pfw-codfw from DNS
..


Remove pfw-codfw from DNS

Bug: T171970
Change-Id: Id7b0564fe8f9ac52c50e6c8ca031c8a4df51f018
---
M templates/10.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 1 insertion(+), 20 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index bc64966..1734a04 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3536,8 +3536,6 @@
 17  1H IN PTR  asw-b-codfw.mgmt.codfw.wmnet.
 18  1H IN PTR  asw-c-codfw.mgmt.codfw.wmnet.
 19  1H IN PTR  asw-d-codfw.mgmt.codfw.wmnet.
-21  1H IN PTR  pfw1-codfw.mgmt.codfw.wmnet.
-22  1H IN PTR  pfw2-codfw.mgmt.codfw.wmnet.
 23  1H IN PTR  pfw3a-codfw.mgmt.codfw.wmnet.
 24  1H IN PTR  pfw3b-codfw.mgmt.codfw.wmnet.
 25  1H IN PTR  ps1-a1-codfw.mgmt.codfw.wmnet.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index c489910..542dad6 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -93,7 +93,6 @@
 192 1H  IN PTR  cr1-codfw.wikimedia.org.
 193 1H  IN PTR  cr2-codfw.wikimedia.org.
 194 1H  IN PTR  pim-rp.wikimedia.org.
-195 1H  IN PTR  pfw-codfw.wikimedia.org.
 196 1H  IN PTR  mr1-codfw.wikimedia.org.
 197 1H  IN PTR  pfw3-codfw.wikimedia.org.
 198 1H  IN PTR  cr1-eqdfw.wikimedia.org.
@@ -127,14 +126,6 @@
 ; 208.80.153.212/31 (cr2-codfw <--> cr1-eqdfw)
 212 1H  IN PTR  xe-5-0-0.cr2-codfw.wikimedia.org.
 213 1H  IN PTR  xe-1-0-0.cr1-eqdfw.wikimedia.org.
-
-; 208.80.153.214/31 (cr1-codfw <--> pfw-codfw)
-214 1H  IN PTR  xe-5-0-3.cr1-codfw.wikimedia.org.
-215 1H  IN PTR  xe-6-0-0.pfw-codfw.wikimedia.org.
-
-; 208.80.153.216/31 (cr2-codfw <--> pfw-codfw)
-216 1H  IN PTR  xe-5-0-3.cr2-codfw.wikimedia.org.
-217 1H  IN PTR  xe-15-0-0.pfw-codfw.wikimedia.org.
 
 ; 208.80.153.218/31 (cr1-codfw <--> cr2-codfw)
 218 1H  IN PTR  ae0.cr1-codfw.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 37d8096..d28bc0a 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,9 +156,7 @@
 220 1H  IN PTR  xe-3-3-2.cr2-eqiad.wikimedia.org.
 221 1H  IN PTR  xe-15-0-0.pfw-eqiad.wikimedia.org.
 
-; 208.80.154.222/31 (pfw-eqiad <--> pfw-codfw)
-222 1H  IN PTR  st0.pfw-eqiad.wikimedia.org.
-223 1H  IN PTR  st0.pfw-codfw.wikimedia.org.
+; 208.80.154.222/31 unused
 
 ; 208.80.154.224/27 (224-255) LVS Service IPs
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 50e1b97..429e101 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -454,10 +454,6 @@
 pfw1-eqiad  1H  IN CNAME pfw-eqiad
 pfw2-eqiad  1H  IN CNAME pfw-eqiad
 
-pfw-codfw   1H  IN A 208.80.153.195
-pfw1-codfw  1H  IN CNAME pfw-codfw
-pfw2-codfw  1H  IN CNAME pfw-codfw
-
 pfw3-codfw   1H  IN A208.80.153.197
 
 ; Cams
diff --git a/templates/wmnet b/templates/wmnet
index 507cfc9..63d3ff1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3241,8 +3241,6 @@
 scs-a1-codfw1H  IN A10.193.0.14
 scs-c1-codfw1H  IN A10.193.0.15
 
-pfw1-codfw  1H  IN A10.193.0.21
-pfw2-codfw  1H  IN A10.193.0.22
 pfw3a-codfw 1H  IN A10.193.0.23
 pfw3b-codfw 1H  IN A10.193.0.24
 ps1-a1-codfw1H  IN A10.193.0.25

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

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

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


[MediaWiki-commits] [Gerrit] operations/dns[master]: Remove pfw-codfw from DNS

2017-08-08 Thread Ayounsi (Code Review)
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370661 )

Change subject: Remove pfw-codfw from DNS
..

Remove pfw-codfw from DNS

Bug: T171970
Change-Id: Id7b0564fe8f9ac52c50e6c8ca031c8a4df51f018
---
M templates/10.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 1 insertion(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/61/370661/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index bc64966..1734a04 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3536,8 +3536,6 @@
 17  1H IN PTR  asw-b-codfw.mgmt.codfw.wmnet.
 18  1H IN PTR  asw-c-codfw.mgmt.codfw.wmnet.
 19  1H IN PTR  asw-d-codfw.mgmt.codfw.wmnet.
-21  1H IN PTR  pfw1-codfw.mgmt.codfw.wmnet.
-22  1H IN PTR  pfw2-codfw.mgmt.codfw.wmnet.
 23  1H IN PTR  pfw3a-codfw.mgmt.codfw.wmnet.
 24  1H IN PTR  pfw3b-codfw.mgmt.codfw.wmnet.
 25  1H IN PTR  ps1-a1-codfw.mgmt.codfw.wmnet.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index c489910..542dad6 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -93,7 +93,6 @@
 192 1H  IN PTR  cr1-codfw.wikimedia.org.
 193 1H  IN PTR  cr2-codfw.wikimedia.org.
 194 1H  IN PTR  pim-rp.wikimedia.org.
-195 1H  IN PTR  pfw-codfw.wikimedia.org.
 196 1H  IN PTR  mr1-codfw.wikimedia.org.
 197 1H  IN PTR  pfw3-codfw.wikimedia.org.
 198 1H  IN PTR  cr1-eqdfw.wikimedia.org.
@@ -127,14 +126,6 @@
 ; 208.80.153.212/31 (cr2-codfw <--> cr1-eqdfw)
 212 1H  IN PTR  xe-5-0-0.cr2-codfw.wikimedia.org.
 213 1H  IN PTR  xe-1-0-0.cr1-eqdfw.wikimedia.org.
-
-; 208.80.153.214/31 (cr1-codfw <--> pfw-codfw)
-214 1H  IN PTR  xe-5-0-3.cr1-codfw.wikimedia.org.
-215 1H  IN PTR  xe-6-0-0.pfw-codfw.wikimedia.org.
-
-; 208.80.153.216/31 (cr2-codfw <--> pfw-codfw)
-216 1H  IN PTR  xe-5-0-3.cr2-codfw.wikimedia.org.
-217 1H  IN PTR  xe-15-0-0.pfw-codfw.wikimedia.org.
 
 ; 208.80.153.218/31 (cr1-codfw <--> cr2-codfw)
 218 1H  IN PTR  ae0.cr1-codfw.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 37d8096..d28bc0a 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -156,9 +156,7 @@
 220 1H  IN PTR  xe-3-3-2.cr2-eqiad.wikimedia.org.
 221 1H  IN PTR  xe-15-0-0.pfw-eqiad.wikimedia.org.
 
-; 208.80.154.222/31 (pfw-eqiad <--> pfw-codfw)
-222 1H  IN PTR  st0.pfw-eqiad.wikimedia.org.
-223 1H  IN PTR  st0.pfw-codfw.wikimedia.org.
+; 208.80.154.222/31 unused
 
 ; 208.80.154.224/27 (224-255) LVS Service IPs
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 50e1b97..429e101 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -454,10 +454,6 @@
 pfw1-eqiad  1H  IN CNAME pfw-eqiad
 pfw2-eqiad  1H  IN CNAME pfw-eqiad
 
-pfw-codfw   1H  IN A 208.80.153.195
-pfw1-codfw  1H  IN CNAME pfw-codfw
-pfw2-codfw  1H  IN CNAME pfw-codfw
-
 pfw3-codfw   1H  IN A208.80.153.197
 
 ; Cams
diff --git a/templates/wmnet b/templates/wmnet
index 507cfc9..63d3ff1 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3241,8 +3241,6 @@
 scs-a1-codfw1H  IN A10.193.0.14
 scs-c1-codfw1H  IN A10.193.0.15
 
-pfw1-codfw  1H  IN A10.193.0.21
-pfw2-codfw  1H  IN A10.193.0.22
 pfw3a-codfw 1H  IN A10.193.0.23
 pfw3b-codfw 1H  IN A10.193.0.24
 ps1-a1-codfw1H  IN A10.193.0.25

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

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

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