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

(FM-5598) NTP 5.0.0 features and release-prep #346

Merged
merged 10 commits into from
Oct 14, 2016
Merged

Conversation

DavidS
Copy link
Contributor

@DavidS DavidS commented Oct 14, 2016

No description provided.

#Otherwise use the defined erb/epp template, or use default
if $ntp::config_epp and $ntp::config_template {
fail('Cannot supply both config_epp and config_template templates for ntp config file.')
}elsif $ntp::config_template {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's up with the cuddled elsifs here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would have passed lint, fixed anyways, because humans still >> machines.

DavidS and others added 10 commits October 14, 2016 16:55
rspec-puppet-facts is now provided by the default modulesync configs
The following changes will only run (well) on puppet 4.5 or later. Therefore
we can drop the puppet 3 testing on travis, and add more in-depth testing for
puppet 4. Update the version_requirement in metadata.json. We'll also require
the newest version of stdlib for the validate_legacy and deprecation functions.

Since we are dropping compatibilty with puppet 3, users of that version would
experience breakage with the new ntp version, therefore this is a major version
bump.
Note that data-in-modules is currently still marked as "experimental",
but will be finalized soon, supporting what is currently used here.
This requires more work to add depreciations to the current hodge-podge,
to tighten down what is allowed. Many of the unchecked edge-cases will
result in a broken ntp config anyways, but just fixing it would elevate
issues in this area from broken ntp service to broken catalog.
After this change, the module uses, and can accept EPP templates through the config_epp and step_tickers_epp parameters. ERB templates are still valid through the config_template and step_tickers_template parameters.

Backwards-Compatibility-Saved-By: Wilson McCoubrey <wilson@puppet.com>
This updates all ntp class params to allow proper puppet 4 type checking,
while still retaining the possibility to accept all formerly allowed
values. Values that were allowed by the previous validation code, but will
not pass the new type validation will be flagged with a deprecation warning.

This requires the EPP template commit, so that all users of these values are
prepared to handle the new values.
Copy-Edited-By: jbondpdx <jean@puppet.com>
@bmjen
Copy link
Contributor

bmjen commented Oct 14, 2016

👍

@bmjen bmjen merged commit 0c0168d into puppetlabs:master Oct 14, 2016
@DavidS DavidS deleted the ntp-next branch October 18, 2016 18:12
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.

5 participants