Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404053 )
Change subject: DHCP: rm rm linux-host-entries.ttyS0-9600 (cameras) ...................................................................... DHCP: rm rm linux-host-entries.ttyS0-9600 (cameras) This file only contains former IP-capable cameras that have not been in use since a long time and are unmounted per racktables. as per Moritz on: https://gerrit.wikimedia.org/r/#/c/399826/1/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600 Since nothing else uses these we can (and have to) remove the file inclusion from main DHCP config. Change-Id: I00fb64f3aad26fa2c78ea36c8748f1cc04aaa379 --- M modules/install_server/files/dhcpd/dhcpd.conf D modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600 2 files changed, 0 insertions(+), 40 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install_server/files/dhcpd/dhcpd.conf b/modules/install_server/files/dhcpd/dhcpd.conf index 65a7fbf..b5cd178 100644 --- a/modules/install_server/files/dhcpd/dhcpd.conf +++ b/modules/install_server/files/dhcpd/dhcpd.conf @@ -460,12 +460,6 @@ option pxelinux.pathprefix "jessie-installer/"; filename "jessie-installer/debian-installer/amd64/pxelinux.0"; - # Older hosts using Com 0 9600 baud - group { - option pxelinux.configfile "pxelinux.cfg/ttyS0-9600"; - include "/etc/dhcp/linux-host-entries.ttyS0-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.ttyS0-9600 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600 deleted file mode 100644 index 9bddb82..0000000 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-9600 +++ /dev/null @@ -1,34 +0,0 @@ -##################################################################### -#### THIS FILE IS MANAGED BY PUPPET -#### puppet:///modules/install_server/dhcpd/linux-host-entries.ttyS0-9600 -###################################################################### - -host cam1-a-eqiad { - hardware ethernet 00:40:8c:a2:61:40; - fixed-address cam1-a-eqiad.eqiad.wmnet; -} - -host cam2-a-eqiad { - hardware ethernet 00:40:8c:a2:68:ef; - fixed-address cam2-a-eqiad.eqiad.wmnet; -} - -host cam1-a-b-eqiad { - hardware ethernet 00:40:8c:a2:3b:6e; - fixed-address cam1-a-b-eqiad.eqiad.wmnet; -} - -host cam2-a-b-eqiad { - hardware ethernet 00:40:8c:a2:68:fa; - fixed-address cam2-a-b-eqiad.eqiad.wmnet; -} - -host cam1-b-c-eqiad { - hardware ethernet 00:40:8c:a2:69:01; - fixed-address cam1-b-c-eqiad.eqiad.wmnet; -} - -host cam2-b-c-eqiad { - hardware ethernet 00:40:8c:a2:61:25; - fixed-address cam2-b-c-eqiad.eqiad.wmnet; -} -- To view, visit https://gerrit.wikimedia.org/r/404053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00fb64f3aad26fa2c78ea36c8748f1cc04aaa379 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: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: RobH <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
