Add support for additional DHCP listen interfaces #399
Conversation
|
The failing test is not related to my changes and will probably run successfully if re-triggered. So how do I get Travis to run the tests once more? |
|
I'll close the PR and open it again, that should trigger Travis. |
|
That was https://www.traviscistatus.com/incidents/v4jnp6nkgzqx and I was too late with restarting the test. I'll have a look at the changes later. |
|
The tests are now passing, FWIW :) |
manifests/proxydhcp.pp
Outdated
| @@ -33,7 +33,7 @@ | |||
| class { '::dhcp': | |||
| dnsdomain => $foreman_proxy::dhcp_option_domain, | |||
| nameservers => $nameservers, | |||
| interfaces => [$foreman_proxy::dhcp_interface], | |||
| interfaces => [$foreman_proxy::dhcp_interface] + [$foreman_proxy::dhcp_additional_interfaces].flatten.delete_undef_values, | |||
There was a problem hiding this comment.
Yeah, Puppet 4 introduced some nice language features :)
manifests/init.pp
Outdated
| @@ -366,6 +368,7 @@ | |||
| Array[String] $dhcp_option_domain = $::foreman_proxy::params::dhcp_option_domain, | |||
| Optional[Array[String]] $dhcp_search_domains = $::foreman_proxy::params::dhcp_search_domains, | |||
| String $dhcp_interface = $::foreman_proxy::params::dhcp_interface, | |||
| Optional[Variant[Array[String], String]] $dhcp_additional_interfaces = $::foreman_proxy::params::dhcp_additional_interfaces, | |||
There was a problem hiding this comment.
I'd prefer if this was simply Array[String] which defaults to [] in params.pp since it removes the need to clean it up.
manifests/init.pp
Outdated
| @@ -174,6 +174,8 @@ | |||
| # | |||
| # $dhcp_interface:: DHCP listen interface | |||
| # | |||
| # $dhcp_additional_interfaces:: Additional DHCP listen interfaces (in addition to dhcp_interface) | |||
There was a problem hiding this comment.
Could you add that we don't provision any subnet for this by default (in contrast to dhcp_interface)?
antaflos
force-pushed
the
additional_dhcp_interfaces
branch
from
6121cba to
26f7609
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
I've implemented the requested changes. Please let me know if this needs further work. |
manifests/init.pp
Outdated
| @@ -174,6 +174,8 @@ | |||
| # | |||
| # $dhcp_interface:: DHCP listen interface | |||
| # | |||
| # $dhcp_additional_interfaces:: Additional DHCP listen interfaces (in addition to dhcp_interface). Note: as opposed to dhcp_interface *no* subnet will be provisioned for any of the additional DHCP listen interfaces. Please configure any additional subnets using `dhcp::pool` and related resource types (provided by the theforeman/puppet-dhcp module). | |||
There was a problem hiding this comment.
Could you wrap this so it's not such a long line?
There was a problem hiding this comment.
Sure, how should I wrap it? At 140 characters, like this?
# $dhcp_additional_interfaces:: Additional DHCP listen interfaces (in addition to dhcp_interface). Note: as opposed to dhcp_interface *no*
# subnet will be provisioned for any of the additional DHCP listen interfaces. Please configure any additional
# subnets using `dhcp::pool` and related resource types (provided by the theforeman/puppet-dhcp module).
This change adds a new parameter foreman_proxy::dhcp_additional_interfaces which defaults to the empty array `[]`. The parameter's value must be an array of interface names (i.e. an array of strings). When set the managed DHCP server will listen for DHCP requests on these interfaces, in addition to the interface specified in foreman_proxy::dhcp_interface. No subnets will be provisioned for these additional DHCP listen interfaces.
antaflos
force-pushed
the
additional_dhcp_interfaces
branch
from
26f7609 to
9875b90
Compare
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
Ok, done. |
|
merged, thanks @antaflos! |
This change adds a new parameter foreman_proxy::dhcp_additional_interfaces which defaults to the empty array
[]. The parameter's value must be an array of interface names (i.e. an array of strings). When set the managed DHCP server will listen for DHCP requests on these interfaces, in addition to the interface specified in foreman_proxy::dhcp_interface. No subnets will be provisioned for these additional DHCP listen interfaces.Fixes GH-400.