Dzahn has submitted this change and it was merged.
Change subject: remove db67 from coredb,decom db64,db65,db66,db70
......................................................................
remove db67 from coredb,decom db64,db65,db66,db70
- remove db67 from role/coredb config
- remove db67 from site.pp
- remove db64,db65,db66,db67,db70 from DHCP
ok to remove this researchdb?
RT #7129
Change-Id: I2b6bf8555b0f3af120272e7dfb36f8b7e39aa23f
---
M manifests/role/coredb.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 35 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 6e102b5..ad280cf 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -9,12 +9,12 @@
class role::coredb::config {
$topology = {
's1' => {
- 'hosts' => { 'pmtpa' => [ 'db63', 'db67' ],
+ 'hosts' => { 'pmtpa' => [ 'db63' ],
'eqiad' => [ 'db1037', 'db1043', 'db1049',
'db1050', 'db1051', 'db1052', 'db1055', 'db1056', 'db1061', 'db1062' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db63", 'eqiad' => 'db1052' },
'snapshot' => [ 'db1050' ],
- 'no_master' => [ 'db67', 'db1047', 'db1050', 'db1055' ]
+ 'no_master' => [ 'db1047', 'db1050', 'db1055' ]
},
's2' => {
'hosts' => { 'pmtpa' => [ 'db69' ],
diff --git a/manifests/site.pp b/manifests/site.pp
index cfe3748..3d0581a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -635,15 +635,8 @@
include role::coredb::m2
}
-## researchdb
-node 'db67.pmtpa.wmnet' {
- class { 'role::coredb::researchdb':
- mariadb => true,
- }
-}
-
## imminent decomission/reclaim from pmtpa pending 12th floor reorg
-node /^db(6[012456]|7[5-7])\.pmtpa\.wmnet/{
+node /^db(60|7[5-7])\.pmtpa\.wmnet/{
include standard
}
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0d78653..77d9ae8 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -737,26 +737,6 @@
fixed-address db63.pmtpa.wmnet;
}
-host db64 {
- hardware ethernet d4:ae:52:95:4a:d7;
- fixed-address db64.pmtpa.wmnet;
-}
-
-host db65 {
- hardware ethernet d4:ae:52:8b:9f:b3;
- fixed-address db65.pmtpa.wmnet;
-}
-
-host db66 {
- hardware ethernet d4:ae:52:90:3b:53;
- fixed-address db66.pmtpa.wmnet;
-}
-
-host db67 {
- hardware ethernet d4:ae:52:95:4a:e0;
- fixed-address db67.pmtpa.wmnet;
-}
-
host db68 {
hardware ethernet d4:ae:52:8b:eb:2e;
fixed-address db68.pmtpa.wmnet;
@@ -765,11 +745,6 @@
host db69 {
hardware ethernet d4:ae:52:90:3e:dc;
fixed-address db69.pmtpa.wmnet;
-}
-
-host db70 {
- hardware ethernet d4:ae:52:90:39:98;
- fixed-address db70.pmtpa.wmnet;
}
host db71 {
--
To view, visit https://gerrit.wikimedia.org/r/122406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b6bf8555b0f3af120272e7dfb36f8b7e39aa23f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
