-
Notifications
You must be signed in to change notification settings - Fork 328
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
Add ntp stepout, minpoll and maxpoll options #255
Conversation
|
Actually, I don't understand, why Travis CI cannot build this on 3.0 with future parser. I tested it on 3.4.2 with standard parser and with future parser w/o any warning. |
|
@sorrowless the issue with newer versions of the future parser is it doesn't automatically cast ints to strings, and validate_re only works on strings. |
| @@ -42,10 +46,12 @@ | |||
| validate_re($keys_controlkey, ['^\d+$', '']) | |||
| validate_re($keys_requestkey, ['^\d+$', '']) | |||
| validate_array($keys_trusted) | |||
| validate_re($minpoll, '^([3-9]|1[0-6])$') | |||
| validate_re($minpoll, '^([3-9]|1[0-6])$') | |||
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.
Rather than using validate_re here you should try validate_numeric with min/max values set (docs). This should also resolve the future parser issues.
|
Hey @sorrowless , thanks for the contribution. In general this looks pretty good, but I had some inline comments. If you could address those this should be good to merge I think. Thanks! |
|
Hi, @mhaskel . Your request done. Would you kind to see it again and tell whether it can be merged? |
| should contain_file('/etc/ntp.conf').with({ | ||
| 'content' => /tinker panic 0/, | ||
| }) | ||
| end |
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.
Can you get rid of the trailing whitespace on L608-612?
|
@sorrowless other than the whitespace issue the code looks good. Can you please squash this down to a single commit though? THanks! |
Change options: * panic - panic is not boolean, it is integer, actually Add options: * tinker - disable or enable tinker * minpoll - to change ntpd send packages frequency * maxpoll - to change ntpd send packages frequency * stepout - to change stepout interval Also Readme file changed accordingly.
0991d4f
to
75d47b4
Compare
|
@mhaskel, done. |
Add ntp stepout, minpoll and maxpoll options
|
thanks @sorrowless! |
|
I did just notice that this makes the module require the latest version of On Thu, Apr 16, 2015 at 11:19 AM, jasondowns notifications@github.com
Morgan Haskel PuppetConf 2015 http://2015.puppetconf.com/ is coming to Portland, |
PR #255 added a dependency on stdlib >= 4.6.0
(MODULES-1925) ntp stepout, minpoll and maxpoll options should be added
Change options:
Add options:
Add tests, change readme.