BBlack has submitted this change and it was merged.
Change subject: Reclaim ssl[13]00x
......................................................................
Reclaim ssl[13]00x
Change-Id: I736bb3d7afd8454ebc445b7c0a8a02718c6abf37
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 1 insertion(+), 84 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 19c9ce1..7756914 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2461,24 +2461,6 @@
}
}
-# To be decommed soon
-node /ssl100[1-9]\.wikimedia\.org/ {
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
- include standard
- include admin
-}
-
-# To be decommed soon
-node /ssl300[1-4]\.esams\.wikimedia\.org/ {
- interface::add_ip6_mapped { 'main':
- interface => 'eth0'
- }
- include standard
- include admin
-}
-
node 'strontium.eqiad.wmnet' {
include standard
include admin
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index b0ecada..69416b5 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -86,7 +86,7 @@
search[0-9]*) echo partman/search.cfg ;; \
snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
-
argon|bast4001|copper|neon|ruthenium|ssl[1-3]0[0-9][0-9]|ssl[0-9]|titanium|ytterbium|zirconium)
echo partman/raid1-lvm.cfg ;; \
+
argon|bast4001|copper|neon|ruthenium|titanium|ytterbium|zirconium) echo
partman/raid1-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
virt101[0-2]) echo partman/virt-hp.cfg ;; \
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 f2cb162..a3f0d69 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3844,71 +3844,6 @@
fixed-address sodium.wikimedia.org;
}
-host ssl1001 {
- hardware ethernet 78:2b:cb:09:10:91;
- fixed-address ssl1001.wikimedia.org;
-}
-
-host ssl1002 {
- hardware ethernet 78:2b:cb:08:a0:c0;
- fixed-address ssl1002.wikimedia.org;
-}
-
-host ssl1003 {
- hardware ethernet 78:2b:cb:08:aa:75;
- fixed-address ssl1003.wikimedia.org;
-}
-
-host ssl1004 {
- hardware ethernet 78:2b:cb:08:a4:59;
- fixed-address ssl1004.wikimedia.org;
-}
-
-host ssl1005 {
- hardware ethernet 90:B1:1C:2A:09:F7;
- fixed-address ssl1005.wikimedia.org;
-}
-
-host ssl1006 {
- hardware ethernet 90:B1:1C:2A:36:F9;
- fixed-address ssl1006.wikimedia.org;
-}
-
-host ssl1007 {
- hardware ethernet 90:B1:1C:2D:7F:6B;
- fixed-address ssl1007.wikimedia.org;
-}
-
-host ssl1008 {
- hardware ethernet 90:B1:1C:2D:87:0C;
- fixed-address ssl1008.wikimedia.org;
-}
-
-host ssl1009 {
- hardware ethernet 90:B1:1C:2D:80:E4;
- fixed-address ssl1009.wikimedia.org;
-}
-
-host ssl3001 {
- hardware ethernet 78:2b:cb:45:1d:e0;
- fixed-address ssl3001.esams.wikimedia.org;
-}
-
-host ssl3002 {
- hardware ethernet 78:2b:cb:45:6a:4a;
- fixed-address ssl3002.esams.wikimedia.org;
-}
-
-host ssl3003 {
- hardware ethernet 78:2b:cb:45:2b:de;
- fixed-address ssl3003.esams.wikimedia.org;
-}
-
-host ssl3004 {
- hardware ethernet 78:2b:cb:45:2c:0b;
- fixed-address ssl3004.esams.wikimedia.org;
-}
-
host stat1001 {
hardware ethernet 78:2b:cb:35:c4:f7;
fixed-address stat1001.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/178973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I736bb3d7afd8454ebc445b7c0a8a02718c6abf37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
