Cmjohnson has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397856 )

Change subject: Removing site.pp entries and dhcpd file entries for decom'd 
db1015,21,46-49,50
......................................................................


Removing site.pp entries and dhcpd file entries for decom'd db1015,21,46-49,50

Change-Id: I569d8ee628488a75dda2221f157434ffb516e217
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 47 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4deffc7..c3d9663 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -330,10 +330,6 @@
     role(mariadb::core)
 }
 
-node 'db1021.eqiad.wmnet' {
-    role(spare::system)
-}
-
 
 # s2 (large wikis) core production dbs on codfw
 # codfw master
@@ -356,9 +352,6 @@
     role(mariadb::core)
 }
 
-node 'db1044.eqiad.wmnet' {
-    role(spare::system)
-}
 # s3 (default) core production dbs on codfw
 # codfw master
 node 'db2018.codfw.wmnet' {
@@ -550,10 +543,6 @@
     }
 }
 
-node 'db1048.eqiad.wmnet' {
-    role(spare::system)
-}
-
 node 'db1059.eqiad.wmnet' {
     class { '::role::mariadb::misc::phabricator':
         shard => 'm3',
@@ -568,21 +557,11 @@
 
 # m4 shard
 
-# old eventlogging master database, will be decommed in T156844
-node 'db1046.eqiad.wmnet' {
-    role(spare::system)
-}
-
 node 'db1107.eqiad.wmnet' {
     role(mariadb::misc::eventlogging::master)
 }
 
 # These replicas have an m4 custom replication protocol.
-
-# db1047 is a host about to be decommissioned (T156844)
-node 'db1047.eqiad.wmnet' {
-    role(spare::system)
-}
 
 node 'db1108.eqiad.wmnet' {
     role(mariadb::misc::eventlogging::replica)
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 77bbfbf..c7ae7e2 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -959,32 +959,6 @@
     fixed-address db1043.eqiad.wmnet;
 }
 
-host db1046 {
-    hardware ethernet 78:2b:cb:03:60:c9;
-    fixed-address db1046.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host db1047 {
-    hardware ethernet 78:2b:cb:03:64:0e;
-    fixed-address db1047.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host db1048 {
-    hardware ethernet 78:2b:cb:03:66:28;
-    fixed-address db1048.eqiad.wmnet;
-}
-
-host db1049 {
-    hardware ethernet d4:ae:52:65:92:e7;
-    fixed-address db1049.eqiad.wmnet;
-    option pxelinux.pathprefix "trusty-installer/";
-    filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host db1051 {
     hardware ethernet 90:B1:1C:2A:B0:2C;
     fixed-address db1051.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I569d8ee628488a75dda2221f157434ffb516e217
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to