Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manage DAQ network dhcpd #120

Merged
merged 2 commits into from
May 1, 2020
Merged

manage DAQ network dhcpd #120

merged 2 commits into from
May 1, 2020

Conversation

jhoblitt
Copy link
Member

Notice: /Stage[main]/Dhcp/Concat[/etc/dhcp/dhcpd.conf]/File[/etc/dhcp/dhcpd.conf]/content: 
--- /etc/dhcp/dhcpd.conf	2019-10-08 17:00:28.427861509 +0000
+++ /tmp/puppet-file20200430-413113-1o2zor8	2020-04-30 20:41:57.030150545 +0000
@@ -1,8 +1,16 @@
 # dhcpd.conf
-
 omapi-port 7911;
 
-log-facility local7;
+default-lease-time 43200;
+max-lease-time 86400;
+
+
+not authoritative;
+
+
+ddns-update-style none;
+
+option ntp-servers none;
 
 allow booting;
 allow bootp;
@@ -11,39 +19,23 @@
 option fqdn.rcode2            255;
 option pxegrub code 150 = text ;
 
-# Bootfile Handoff
-#option architecture code 93 = unsigned integer 16 ;
-#if option architecture = 00:06 {
-#  filename "grub2/shim.efi";
-#} elsif option architecture = 00:07 {
-#  filename "grub2/shim.efi";
-#} elsif option architecture = 00:09 {
-#  filename "grub2/shim.efi";
-#} else {
-#  filename "pxelinux.0";
-#}
 
-include "/etc/dhcp/dhcpd.hosts";
-# test
-#subnet 10.0.103.0 netmask 255.255.255.0 {
-#  default-lease-time 43200;
-#  max-lease-time 86400;
-#  not authoritative;
-#  ddns-update-style none;
-#  option domain-name "test";
-#  option domain-name-servers 10.0.103.101;
-#  next-server 10.0.103.101;
-#  option ntp-servers none;
-#  range 10.0.103.102 10.0.103.106;
-#  option subnet-mask 255.255.255.0;
-#  option routers 10.0.103.1;
-#}
 
-# Reserve 192.168.100.1 for this machine                                                                                                           
+
+
+log-facility local7;
+
+include "/etc/dhcp/dhcpd.hosts";
+# daq_clients
 subnet 192.168.100.0 netmask 255.255.255.0 {
-  range 192.168.100.2 192.168.100.254;
-  authoritative;
-  ddns-update-style none;
-  default-lease-time -1;
-  max-lease-time -1;
+  pool
+  {
+    authoritative;
+    ddns-update-style none;
+    default-lease-time -1;
+    max-lease-time -1;
+    range 192.168.100.2 192.168.100.254;
+  }
+
+  option subnet-mask 255.255.255.0;
 }

Support for not setting a global namservers value has been merged
upstream but is as of yet unreleased.
@jhoblitt jhoblitt merged commit 94d4c0c into master May 1, 2020
@jhoblitt jhoblitt deleted the IT-2183/fp-dhcpd branch May 1, 2020 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants