Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392617 )
Change subject: install_server: Assign VMs the correct tty
......................................................................
install_server: Assign VMs the correct tty
Ganeti VMs do not have 2 serial ports as our hardware fleet does, but
rather just one. Move all VMs from ttyS1-115200 to ttyS0-115200
Bug: T179036
Change-Id: I8480443c7c5c56c636bf489410e976f3338be2d3
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 48 insertions(+), 47 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index db0a29e..20dd1e6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -156,6 +156,24 @@
fixed-address hassium.eqiad.wmnet;
}
+host install1002 {
+ hardware ethernet aa:00:00:3c:d7:80;
+ fixed-address install1002.wikimedia.org;
+
+ next-server 208.80.153.53; # install2002 (tftp server)
+ option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
+ filename "lpxelinux.0";
+}
+
+host install2002 {
+ hardware ethernet aa:00:00:6b:d7:3f;
+ fixed-address install2002.wikimedia.org;
+
+ next-server 208.80.154.22; # install1002 (tftp server)
+ option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
+ filename "lpxelinux.0";
+}
+
host kraz {
hardware ethernet aa:00:00:e9:b4:28;
fixed-address kraz.wikimedia.org;
@@ -267,9 +285,19 @@
filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
+host netmon1003 {
+ hardware ethernet aa:00:00:79:17:b5;
+ fixed-address netmon1003.wikimedia.org;
+}
+
host nitrogen {
hardware ethernet aa:00:00:e8:68:1f;
fixed-address nitrogen.eqiad.wmnet;
+}
+
+host oresrdb2001 {
+ hardware ethernet aa:00:00:3b:a3:0e;
+ fixed-address oresrdb2001.codfw.wmnet;
}
host planet1001 {
@@ -393,3 +421,23 @@
fixed-address tureis.codfw.wmnet;
}
+host ununpentium {
+ hardware ethernet aa:00:00:66:fb:d9;
+ fixed-address ununpentium.wikimedia.org;
+}
+
+host webperf1001 {
+ hardware ethernet aa:00:00:5e:f4:43;
+ fixed-address webperf1001.eqiad.wmnet;
+ option pxelinux.pathprefix "stretch-installer/";
+ filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host webperf2001 {
+ hardware ethernet aa:00:00:02:8b:11;
+ fixed-address webperf2001.codfw.wmnet;
+ option pxelinux.pathprefix "stretch-installer/";
+ filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+
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 76f6a5e..f336af5 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2503,24 +2503,6 @@
fixed-address hydrogen.wikimedia.org;
}
-host install1002 {
- hardware ethernet aa:00:00:3c:d7:80;
- fixed-address install1002.wikimedia.org;
-
- next-server 208.80.153.53; # install2002 (tftp server)
- option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
- filename "lpxelinux.0";
-}
-
-host install2002 {
- hardware ethernet aa:00:00:6b:d7:3f;
- fixed-address install2002.wikimedia.org;
-
- next-server 208.80.154.22; # install1002 (tftp server)
- option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
- filename "lpxelinux.0";
-}
-
host iridium {
hardware ethernet f0:1f:af:e8:c5:27;
fixed-address iridium.eqiad.wmnet;
@@ -5766,11 +5748,6 @@
filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
-host netmon1003 {
- hardware ethernet aa:00:00:79:17:b5;
- fixed-address netmon1003.wikimedia.org;
-}
-
host netmon2001 {
hardware ethernet 30:e1:71:70:2b:94;
fixed-address netmon2001.wikimedia.org;
@@ -5907,11 +5884,6 @@
host oresrdb1002{
hardware ethernet C8:1F:66:BF:81:12;
fixed-address oresrdb1002.eqiad.wmnet;
-}
-
-host oresrdb2001 {
- hardware ethernet aa:00:00:3b:a3:0e;
- fixed-address oresrdb2001.codfw.wmnet;
}
host oresrdb2002 {
@@ -6398,11 +6370,6 @@
fixed-address tungsten.eqiad.wmnet;
}
-host ununpentium {
- hardware ethernet aa:00:00:66:fb:d9;
- fixed-address ununpentium.wikimedia.org;
-}
-
host uranium {
hardware ethernet 84:2b:2b:fb:a6:67;
fixed-address uranium.wikimedia.org;
@@ -6413,20 +6380,6 @@
host wasat {
hardware ethernet 14:02:ec:3f:47:8c;
fixed-address wasat.codfw.wmnet;
-}
-
-host webperf1001 {
- hardware ethernet aa:00:00:5e:f4:43;
- fixed-address webperf1001.eqiad.wmnet;
- option pxelinux.pathprefix "stretch-installer/";
- filename "stretch-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host webperf2001 {
- hardware ethernet aa:00:00:02:8b:11;
- fixed-address webperf2001.codfw.wmnet;
- option pxelinux.pathprefix "stretch-installer/";
- filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
host wezen {
--
To view, visit https://gerrit.wikimedia.org/r/392617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8480443c7c5c56c636bf489410e976f3338be2d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
