Dzahn has submitted this change and it was merged.
Change subject: rm cp1043,cp1044 from site, installserver & torrus
......................................................................
rm cp1043,cp1044 from site, installserver & torrus
These servers were already marked for decom for a while.
This removes them from puppet, installserver and also
the torrus config which still had them for a test cdn setup.
Bug:T133614
Change-Id: I71c398ee2595321bef392a45cbc03f81db2513be
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/torrus/tests/cdn.pp
3 files changed, 1 insertion(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index adbc943..fd6e70a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -321,12 +321,6 @@
interface::add_ip6_mapped { 'main': }
}
-# to be decommed shortly!
-node /^cp104[34]\.eqiad\.wmnet$/ {
- interface::add_ip6_mapped { 'main': }
- role spare # to be decommed (T133614)
-}
-
node /^cp10(45|5[18]|61)\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::misc, ipsec
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 b1ee4d8..8352197 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -418,16 +418,6 @@
fixed-address cp1008.wikimedia.org;
}
-host cp1043 {
- hardware ethernet 84:2b:2b:fd:c0:2f;
- fixed-address cp1043.eqiad.wmnet;
-}
-
-host cp1044 {
- hardware ethernet 84:2b:2b:fd:bd:f8;
- fixed-address cp1044.eqiad.wmnet;
-}
-
host cp1045 {
hardware ethernet 90:B1:1C:42:E8:15;
fixed-address cp1045.eqiad.wmnet;
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index fa64b8c..e052c23 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -44,7 +44,7 @@
]
},
'misc' => {
- 'eqiad' => ['cp1043.eqiad.wmnet', 'cp1044.eqiad.wmnet'],
+ 'eqiad' => [],
'esams' => [],
'ulsfo' => [],
}
--
To view, visit https://gerrit.wikimedia.org/r/293669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71c398ee2595321bef392a45cbc03f81db2513be
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
