-
Notifications
You must be signed in to change notification settings - Fork 498
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
allow setting a default lease time for networks #1799
base: main
Are you sure you want to change the base?
allow setting a default lease time for networks #1799
Conversation
…work_dhcp_default_lease_time
I think the errors are not from my changes... |
@@ -33,6 +33,9 @@ | |||
<bootp file="<%= @network_dhcp_bootp_file %>" /> | |||
<% end %> | |||
<% end %> | |||
<% if @network_dhcp_default_lease_time %> | |||
<lease expiry='@network_dhcp_default_lease_time' unit='hours'/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From the issue discussion, this looked like it should be inside the range tag, while here it is only inside the dhcp tag. Appears would need to change how the range tag is closed to add this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for checking, nice catch! I addressed this by adding a closing </range>
tag if @network_dhcp_default_lease_time is defined.
see 1aa7ed8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it'll require changing the range tag as well to remove the trailing />
to prevent it being closed before this as well. Presumably this means the current bootp XML is ignored as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True. If my XML is not off, commit 4c25b52 should fix this...
…ry if @network_dhcp_default_lease_time is set
8310dee
to
9306375
Compare
… DHCP range with a closing </range>, to allow adding @network_dhcp_bootp_file or @network_dhcp_default_lease_time in between
see #1792