Cmjohnson has submitted this change and it was merged.
Change subject: decommision db3[29] db4[2-6] db5[1235689]
......................................................................
decommision db3[29] db4[2-6] db5[1235689]
Change-Id: I8e3b3277f92148b1a1df46dda4ee79c8cb55088b
---
M files/dhcpd/linux-host-entries.ttyS0-9600
M files/dhcpd/linux-host-entries.ttyS1-115200
M files/dsh/group/db
M manifests/decommissioning.pp
M manifests/role/coredb.pp
M manifests/site.pp
6 files changed, 27 insertions(+), 98 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS0-9600
b/files/dhcpd/linux-host-entries.ttyS0-9600
index ca0036a..c03cf82 100644
--- a/files/dhcpd/linux-host-entries.ttyS0-9600
+++ b/files/dhcpd/linux-host-entries.ttyS0-9600
@@ -73,11 +73,6 @@
fixed-address db31.pmtpa.wmnet;
}
-host db32 {
- hardware ethernet 00:21:28:6B:9D:CA;
- fixed-address db32.pmtpa.wmnet;
-}
-
host db33 {
hardware ethernet 00:21:28:6B:9D:86;
fixed-address db33.pmtpa.wmnet;
@@ -105,11 +100,6 @@
host db38 {
hardware ethernet 00:21:28:6B:9D:B6;
fixed-address db38.pmtpa.wmnet;
-}
-
-host db39 {
- hardware ethernet 00:21:28:6B:CD:9E;
- fixed-address db39.pmtpa.wmnet;
}
host db40 {
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 20897c6..e047b05 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -765,31 +765,6 @@
fixed-address dataset1001.wikimedia.org;
}
-host db42 {
- hardware ethernet e4:1f:13:69:cd:40;
- fixed-address db42.pmtpa.wmnet;
-}
-
-host db43 {
- hardware ethernet 78:2b:cb:15:8d:8f;
- fixed-address db43.pmtpa.wmnet;
-}
-
-host db44 {
- hardware ethernet 78:2b:cb:15:8a:8d;
- fixed-address db44.pmtpa.wmnet;
-}
-
-host db45 {
- hardware ethernet 78:2b:cb:15:8c:b0;
- fixed-address db45.pmtpa.wmnet;
-}
-
-host db46 {
- hardware ethernet 78:2b:cb:15:85:56;
- fixed-address db46.pmtpa.wmnet;
-}
-
host db47 {
hardware ethernet 78:2b:cb:15:8d:ca;
fixed-address db47.pmtpa.wmnet;
@@ -810,49 +785,14 @@
fixed-address db50.pmtpa.wmnet;
}
-host db51 {
- hardware ethernet 78:2b:cb:6b:e2:c4;
- fixed-address db51.pmtpa.wmnet;
-}
-
-host db52 {
- hardware ethernet 78:2b:cb:67:fd:1f;
- fixed-address db52.pmtpa.wmnet;
-}
-
-host db53 {
- hardware ethernet 78:2b:cb:6b:d2:82;
- fixed-address db53.pmtpa.wmnet;
-}
-
host db54 {
hardware ethernet 78:2b:cb:6b:aa:33;
fixed-address db54.pmtpa.wmnet;
}
-host db55 {
- hardware ethernet 78:2b:cb:66:ce:4b;
- fixed-address db55.pmtpa.wmnet;
-}
-
-host db56 {
- hardware ethernet 78:2b:cb:6b:ce:d0;
- fixed-address db56.pmtpa.wmnet;
-}
-
host db57 {
hardware ethernet 78:2b:cb:6b:c6:ef;
fixed-address db57.pmtpa.wmnet;
-}
-
-host db58 {
- hardware ethernet 78:2b:cb:66:aa:40;
- fixed-address db58.pmtpa.wmnet;
-}
-
-host db59 {
- hardware ethernet d4:ae:52:68:9d:69;
- fixed-address db59.pmtpa.wmnet;
}
host db60 {
diff --git a/files/dsh/group/db b/files/dsh/group/db
index c1fba33..5e98260 100644
--- a/files/dsh/group/db
+++ b/files/dsh/group/db
@@ -44,33 +44,18 @@
db29
db31
-db32
db33
db34
db35
db36
db37
db38
-db39
db40
-
-db42
-db43
-db44
-db45
-db46
db47
db48
db49
db50
-db51
-db52
-db53
db54
-db55
-db56
db57
-db58
-db59
db60
db9
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 8551448..ddd71f0 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -25,6 +25,20 @@
'cp1042',
'cp3001',
'cp3002',
+'db32',
+'db39',
+'db42',
+'db43',
+'db44',
+'db45',
+'db46',
+'db51',
+'db52',
+'db53',
+'db55',
+'db56',
+'db58',
+'db59',
'dysprosium',
'ms1',
'ms2',
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index a64499d..9c39cd0 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -9,23 +9,23 @@
class role::coredb::config {
$topology = {
's1' => {
- 'hosts' => { 'pmtpa' => [ 'db32', 'db59', 'db60',
'db63', 'db67', 'db69', 'db71' ],
+ 'hosts' => { 'pmtpa' => [ 'db60', 'db63', 'db67',
'db69', 'db71' ],
'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1056' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db63", 'eqiad' => "db1056" },
- 'snapshot' => [ "db32", "db1050" ],
+ 'snapshot' => [ "db1050" ],
'no_master' => [ 'db67', 'db1047' ]
},
's2' => {
- 'hosts' => { 'pmtpa' => [ 'db52', 'db53', 'db54',
'db57' ],
+ 'hosts' => { 'pmtpa' => [ 'db54', 'db57' ],
'eqiad' => [ 'db1002', 'db1009', 'db1018',
'db1034', 'db1036' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db54", 'eqiad' => "db1036" },
- 'snapshot' => [ "db53", "db1018" ],
+ 'snapshot' => [ "db1018" ],
'no_master' => []
},
's3' => {
- 'hosts' => { 'pmtpa' => [ 'db34', 'db39', 'db64',
'db66' ],
+ 'hosts' => { 'pmtpa' => [ 'db34', 'db64', 'db66' ],
'eqiad' => [ 'db1003', 'db1010', 'db1019',
'db1035', 'db1038' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db34", 'eqiad' => "db1038" },
@@ -33,7 +33,7 @@
'no_master' => []
},
's4' => {
- 'hosts' => { 'pmtpa' => [ 'db31', 'db51', 'db65',
'db72' ],
+ 'hosts' => { 'pmtpa' => [ 'db31', 'db65', 'db72' ],
'eqiad' => [ 'db1004', 'db1011', 'db1020',
'db1042', 'db1059' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db31", 'eqiad' => "db1059" },
@@ -41,27 +41,27 @@
'no_master' => []
},
's5' => {
- 'hosts' => { 'pmtpa' => [ 'db44', 'db45', 'db55',
'db73', 'db74' ],
+ 'hosts' => { 'pmtpa' => [ 'db73', 'db74' ],
'eqiad' => [ 'db1005', 'db1021', 'db1026',
'db1045', 'db1058' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db73", 'eqiad' => "db1058" },
- 'snapshot' => [ "db55", "db1005" ],
+ 'snapshot' => [ "db1005" ],
'no_master' => []
},
's6' => {
- 'hosts' => { 'pmtpa' => [ 'db43', 'db46', 'db47',
'db50' ],
+ 'hosts' => { 'pmtpa' => [ 'db47', 'db50' ],
'eqiad' => [ 'db1006', 'db1015', 'db1022',
'db1027', 'db1040' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db47", 'eqiad' => "db1027" },
- 'snapshot' => [ "db46", "db1022" ],
+ 'snapshot' => [ "db1022" ],
'no_master' => []
},
's7' => {
- 'hosts' => { 'pmtpa' => [ 'db37', 'db56', 'db58',
'db68' ],
+ 'hosts' => { 'pmtpa' => [ 'db37', 'db68' ],
'eqiad' => [ 'db1007', 'db1024', 'db1028',
'db1039', 'db1041' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db37", 'eqiad' => "db1039" },
- 'snapshot' => [ "db56", "db1007" ],
+ 'snapshot' => [ "db1007" ],
'no_master' => []
},
'x1' => {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2671fb3..fd0c11b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -651,7 +651,7 @@
}
## imminent decomission/reclaim from pmtpa pending 12th floor reorg
-node /^db(3[29]|4[2-6]|5[1235689]|6[124]|7[5-7])\.pmtpa\.wmnet/{
+node /^db(6[124]|7[5-7])\.pmtpa\.wmnet/{
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/93052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e3b3277f92148b1a1df46dda4ee79c8cb55088b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
