Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334004 )
Change subject: site.pp, DHCP: remove analytics1015, analytics1026
......................................................................
site.pp, DHCP: remove analytics1015, analytics1026
Bug: T147313
Change-Id: I29648018f021ab823310b33830e5720661ccdb21
---
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, 0 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index e83d785..1ad61b9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -95,15 +95,6 @@
include ::standard
}
-
-node 'analytics1015.eqiad.wmnet' {
- role(spare::system)
-}
-
-node 'analytics1026.eqiad.wmnet' {
- role(spare::system)
-}
-
# analytics1027 hosts hue.wikimedia.org, and is used for launching
# cron based Hadoop jobs.
node 'analytics1027.eqiad.wmnet' {
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 531cb89..c4149bf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -48,7 +48,6 @@
case $(debconf-get netcfg/get_hostname) in \
acamar|achernar|baham|radon|rhodium) echo partman/raid1-lvm.cfg ;; \
analytics1017) echo partman/raid1-30G.cfg ;; \
- analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo
partman/analytics-flex.cfg ;; \
aqs100[456789]) echo partman/aqs-cassandra-8ssd-2srv.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 247bb68..8be27cf 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -38,20 +38,6 @@
filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
}
-host analytics1015 {
- hardware ethernet 90:b1:1c:09:7f:f6;
- fixed-address analytics1015.eqiad.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host analytics1026 {
- hardware ethernet d4:ae:52:7c:c2:70;
- fixed-address analytics1026.eqiad.wmnet;
- option pxelinux.pathprefix "trusty-installer/";
- filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
host analytics1027 {
hardware ethernet d4:ae:52:7a:b9:e5;
fixed-address analytics1027.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/334004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29648018f021ab823310b33830e5720661ccdb21
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
