Add dhcp options to allow overrides #422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
lukealex
commented
Apr 9, 2018
lukealex
commented
- pxefilename (defaults to pxelinux.0) - for example if it was desired to use lpxelinux.0
- network (of the dhcp server, defaults to undef) - the pxeserver is already a variable so it seems reasonable to allow the network to also be variable
- netmask (of the dhcp server, defaults to undef) - the pxeserver is already a variable so it seems reasonable to allow the netmask to also be variable
- pxefilename (defaults to pxelinux.0) - network (of the dhcp server, defaults to undef) - netmask (of the dhcp server, defaults to undef)
ekohl
requested changes
Apr 9, 2018
manifests/init.pp
Outdated
| @@ -185,6 +185,12 @@ | |||
| # | |||
| # $dhcp_pxeserver:: DHCP "next-server" value, defaults otherwise to IP of dhcp_interface | |||
| # | |||
| # $dhcp_pxefilename:: DHCP "filename" value, defaults otherwise to pxelinux.0 | |||
| # | |||
| # $dhcp_network:: DHCP server network value, defaults otherwise to undef | |||
There was a problem hiding this comment.
Could you add that it will determine the network based on dhcp_interface when it's undef? Same for netmask.
manifests/init.pp
Outdated
| @@ -370,6 +376,9 @@ | |||
| Optional[String] $dhcp_gateway = $::foreman_proxy::params::dhcp_gateway, | |||
| Variant[Undef, Boolean, String] $dhcp_range = $::foreman_proxy::params::dhcp_range, | |||
| Optional[String] $dhcp_pxeserver = $::foreman_proxy::params::dhcp_pxeserver, | |||
| Optional[String] $dhcp_pxefilename = $::foreman_proxy::params::dhcp_pxefilename, | |||
There was a problem hiding this comment.
This has a default so it can be String
type to String (there is a default)
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
ekohl
approved these changes
Apr 9, 2018
|
Will let the tests complete before merging. Note to self: this needs a squash on merge. |
|
Thanks! |
juliantodt
pushed a commit
to juliantodt/puppet-foreman_proxy
that referenced
this pull request
Jun 25, 2018
Adding dhcp options to allow override of: - pxefilename (defaults to pxelinux.0) - network (of the dhcp server, defaults to undef) - netmask (of the dhcp server, defaults to undef)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.