Added globaloptions parameter to dhcp class #41
Conversation
|
Waiting for CLA signature by @dgmorales @dgmorales - We require a Contributor License Agreement (CLA) for people who contribute to Puppet, but we have an easy click-through license with instructions, which is available at https://cla.puppetlabs.com/ Note: if your contribution is trivial and you think it may be exempt from the CLA, please post a short reply to this comment with details. http://docs.puppetlabs.com/community/trivial_patch_exemption.html |
|
It is trivial, and I guess it fits your definition of trivial too, but I signed it anyway. Maybe I'll make larger contributions in the future. |
|
@dgmorales thanks for the contribution, and apologies it took so long to get back to you. Do you think you could update |
|
@dgmorales ping? have you had a chance to look at the tests ? |
|
@tphoney Hello, sorry for my silence. I'll take a look at it in a few days. I thought I would be able to do it way sooner, so I didn't answer before. I don't have experience with spec tests yet, but this is a nice opportunity to start changing that. |
|
@dgmorales Thanks for the effort you are putting in, there are loads of examples in other modules and http://ask.puppetlabs.com/questions/ is a great resource too. |
dgmorales
force-pushed
the
globaloptions
branch
from
16568c7 to
6522c8d
Compare
|
I've updated this PR with the tests. I've also rebased it to the current master so it applies cleanly. Hope that's OK. Good learning. In the process I've discovered that dhcp_conf_header was being set to 'eth0', making my tests fail (actually any test based on the content of dhcpd.conf would fail). I've also tried to refactor spec/classes/dhcp_spec.rb so to set a default param of interface => 'eth0' once in the top, instead of setting it in each context. But that got me to more strange errors that I couldn't understand yet. |
| @@ -19,6 +19,7 @@ | |||
| $default_lease_time = 3600, | |||
| $max_lease_time = 86400, | |||
| $service_ensure = running, | |||
| $globaloptions = '' | |||
There was a problem hiding this comment.
Could you keep the trailing comma here?
|
@dgmorales thanks, I had one more comment, and otherwise if you could squash this down to a single commit it should be ready to go! |
dgmorales
force-pushed
the
globaloptions
branch
from
6522c8d to
2497825
Compare
|
@mhaskel done, take a look. |
Added globaloptions parameter to dhcp class
|
Looks good, thanks @dgmorales ! |
This allows one to add arbitrary global options to the main dhcpd.conf file, the same way the module already deals with arbitrary options in a specific pool.