Alexandros Kosiaris has submitted this change and it was merged.
Change subject: DHCP - delete unused linux-host-entry files
......................................................................
DHCP - delete unused linux-host-entry files
Change-Id: Icfc61c9c879209953c9d7d5062028544f5e3c655
---
M modules/install-server/files/dhcpd/dhcpd.conf
D modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
D modules/install-server/files/dhcpd/linux-host-entries.ttyS1-9600
3 files changed, 0 insertions(+), 22 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/install-server/files/dhcpd/dhcpd.conf
b/modules/install-server/files/dhcpd/dhcpd.conf
index fd4436b..5b38445 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -453,18 +453,6 @@
include "/etc/dhcp3/linux-host-entries.ttyS0-9600";
}
- # Dell PowerEdge 1950/2950 (DRAC5) use ttyS1/com2 for LOM console
- group {
- option pxelinux.configfile "pxelinux.cfg/ttyS1-57600";
- include "/etc/dhcp3/linux-host-entries.ttyS1-57600";
- }
-
- # For future use, if we will have a ttyS1/com2 at 9600bps for eLOM
console
- group {
- option pxelinux.configfile "pxelinux.cfg/ttyS1-9600";
- include "/etc/dhcp3/linux-host-entries.ttyS1-9600";
- }
-
# Dell PowerEdge RXXX Line & C2100s
group {
option pxelinux.configfile "pxelinux.cfg/ttyS1-115200";
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
deleted file mode 100644
index b3f5b9a..0000000
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ /dev/null
@@ -1,10 +0,0 @@
-#####################################################################
-#### THIS FILE IS MANAGED BY PUPPET
-#### puppet:///modules/install-server/dhcpd/linux-host-entries.ttyS1-57600
-######################################################################
-
-host sanger {
- hardware ethernet 00:19:B9:DD:86:EB;
- fixed-address sanger.wikimedia.org;
-}
-
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-9600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-9600
deleted file mode 100644
index e69de29..0000000
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-9600
+++ /dev/null
--
To view, visit https://gerrit.wikimedia.org/r/167865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfc61c9c879209953c9d7d5062028544f5e3c655
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
