Cmjohnson has submitted this change and it was merged.
Change subject: Removing puppet entries for db31|3|4|6|7 db47|9 db50|4|7
......................................................................
Removing puppet entries for db31|3|4|6|7 db47|9 db50|4|7
Change-Id: Ib6b7d39f5041ecc4842bb4b44c3e4096224e701a
---
M files/dsh/group/db
M files/dsh/group/mysql
M manifests/decommissioning.pp
M manifests/ganglia.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
6 files changed, 16 insertions(+), 69 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/db b/files/dsh/group/db
index 2220a56..bea35c9 100644
--- a/files/dsh/group/db
+++ b/files/dsh/group/db
@@ -41,19 +41,13 @@
db29
-db31
-db33
-db34
db35
-db36
-db37
+
db38
+
db40
-db47
+
db48
-db49
-db50
-db54
-db57
+
db60
db9
diff --git a/files/dsh/group/mysql b/files/dsh/group/mysql
index b7f2c2e..264ed50 100644
--- a/files/dsh/group/mysql
+++ b/files/dsh/group/mysql
@@ -1,12 +1,3 @@
-db31
-db33
-db34
db35
-db36
-db37
db38
-db47
-db50
-db54
-db57
db60
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 27ec987..b68b996 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -30,18 +30,28 @@
'cp1042',
'cp3001',
'cp3002',
-'db32', # db32,39,426,51-3,55-6,58-9 decommed: rt 6231
+'db31',
+'db32',
+'db33',
+'db34',
+'db36',
+'db37',
'db39',
'db42',
'db43',
'db44',
'db45',
'db46',
+'db47',
+'db49',
+'db50',
'db51',
'db52',
'db53',
+'db54',
'db55',
'db56',
+'db57',
'db58',
'db59',
#dysprosium -- add this back later when it is reclaimed
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index e9d950f..865d869 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -295,7 +295,7 @@
"Jobrunners eqiad " =>
"mw1001.eqiad.wmnet mw1002.eqiad.wmnet",
"Bits application servers pmtpa" =>
"srv248.pmtpa.wmnet srv249.pmtpa.wmnet",
"Bits application servers eqiad" =>
"mw1151.eqiad.wmnet mw1152.eqiad.wmnet",
- "MySQL" => "db50.pmtpa.wmnet",
+ "MySQL" =>
"db1050.eqiad.wmnet",
"PDF servers" =>
"pdf1.wikimedia.org pdf2.wikimedia.org",
"LVS loadbalancers pmtpa" =>
"lvs1.wikimedia.org lvs2.wikimedia.org",
"Miscellaneous" =>
"hooper.wikimedia.org tarin.pmtpa.wmnet",
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
index c03cf82..103d095 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-9600
@@ -68,34 +68,11 @@
fixed-address db29.pmtpa.wmnet;
}
-host db31 {
- hardware ethernet 00:21:28:6B:9D:26;
- fixed-address db31.pmtpa.wmnet;
-}
-
-host db33 {
- hardware ethernet 00:21:28:6B:9D:86;
- fixed-address db33.pmtpa.wmnet;
-}
-
-host db34 {
- hardware ethernet 00:21:28:44:27:CE;
- fixed-address db34.pmtpa.wmnet;
-}
-
host db35 {
hardware ethernet 00:21:28:6B:CD:52;
fixed-address db35.pmtpa.wmnet;
}
-host db36 {
- hardware ethernet 00:21:28:6B:9D:BE;
- fixed-address db36.pmtpa.wmnet;
-}
-host db37 {
- hardware ethernet 00:21:28:6B:CD:CE;
- fixed-address db37.pmtpa.wmnet;
-}
host db38 {
hardware ethernet 00:21:28:6B:9D:B6;
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 6011004..2328ad9 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -714,34 +714,9 @@
fixed-address dataset1001.wikimedia.org;
}
-host db47 {
- hardware ethernet 78:2b:cb:15:8d:ca;
- fixed-address db47.pmtpa.wmnet;
-}
-
host db48 {
hardware ethernet 78:2b:cb:6b:dd:4c;
fixed-address db48.pmtpa.wmnet;
-}
-
-host db49 {
- hardware ethernet 78:2b:cb:6b:e0:e6;
- fixed-address db49.pmtpa.wmnet;
-}
-
-host db50 {
- hardware ethernet 78:2b:cb:6b:d0:f6;
- fixed-address db50.pmtpa.wmnet;
-}
-
-host db54 {
- hardware ethernet 78:2b:cb:6b:aa:33;
- fixed-address db54.pmtpa.wmnet;
-}
-
-host db57 {
- hardware ethernet 78:2b:cb:6b:c6:ef;
- fixed-address db57.pmtpa.wmnet;
}
host db60 {
--
To view, visit https://gerrit.wikimedia.org/r/103550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6b7d39f5041ecc4842bb4b44c3e4096224e701a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
