Skip to content
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

Merge all the templates together, add a few new features to help with the merge. #80

Merged
merged 7 commits into from
Jul 31, 2013
Merged

Conversation

apenney
Copy link
Contributor

@apenney apenney commented Jul 29, 2013

This merges together all the templates into a single template (still overridable) and adds:

  • keys_enable, keys_trusted, keys_controlkey, keys_requestkey, keys_file: Parameters to let you configure ntp keys
  • driftfile: Lets you set the driftfile location.
  • preferred_servers: Lets you set which servers are to be preferred.

Ashley Penney added 7 commits July 29, 2013 17:09
`driftfile` [String]: Allows the setting of the driftfile location.
`keys_enable` [Boolean]: Should the ntp keys option be enabled?
`keys_file` [String]: Where are the keys stored?
`keys_trusted` [Array]: List of keys to trust.
`keys_requestkey` [String]: Request key to use.
`keys_controlkey` [String]: Control key to use.

If keys_enable is set then the directory that keysfile is stored in is
created (recursively).  Currently we don't manage the keys file but that
is an option to be added.
Add a single ntp.conf.erb as the standard template going forward,
to ease the maintenance burden of adding features to this module.
This adds:

`preferred_servers` [Array]: The servers to prefer.

As requested by Erik Dalén!
We're following (where possible) the pattern of having parameters only
exist on interface classes.  As ntp::config and ntp::install are just
internal, private, classes, these don't make sense to allow changes to.
A lot of changes here, primarily to unify the spec testing in a single
spec file to reflect the changes to the private ntp::config and
::install classes.  As a side effect make sure we properly test each
supported distribution (including Gentoo properly) and prefer to use
'content' => /blah/ rather than other methods of testing file contents.
apenney pushed a commit that referenced this pull request Jul 31, 2013
Merge all the templates together, add a few new features to help with the merge.
@apenney apenney merged commit e3feec2 into puppetlabs:master Jul 31, 2013
@apenney apenney deleted the single_template branch July 31, 2013 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant