puppet_ntp.git
6 years agoMerge pull request #91 from apenney/inherits master
Ashley Penney [Thu, 29 Aug 2013 15:42:24 +0000 (08:42 -0700)]
Merge pull request #91 from apenney/inherits

Remove variables, switch to inherits.

6 years agoMerge pull request #92 from meltwater/keyfile_params
Ashley Penney [Tue, 27 Aug 2013 18:00:34 +0000 (11:00 -0700)]
Merge pull request #92 from meltwater/keyfile_params

Update default keys file param variable to match init.pp's

6 years agoUpdate default keys file param variable to match init.pp's
Joseph Swick [Mon, 19 Aug 2013 20:04:47 +0000 (16:04 -0400)]
Update default keys file param variable to match init.pp's

6 years agoRemove variables, switch to inherits.
Ashley Penney [Thu, 15 Aug 2013 00:26:51 +0000 (20:26 -0400)]
Remove variables, switch to inherits.

This commit removes all the local copies of variables in the subclasses
and simply inherits the main class in order to bring variables into the
right scope.

6 years agoMerge pull request #81 from apenney/20-release
Hunter Haugen [Fri, 9 Aug 2013 16:44:49 +0000 (09:44 -0700)]
Merge pull request #81 from apenney/20-release

2.0-rc1 release.

6 years agoAdd in parameters that may be effected.
Ashley Penney [Fri, 9 Aug 2013 16:43:33 +0000 (09:43 -0700)]
Add in parameters that may be effected.

6 years agoAdd `restrict`.
Ashley Penney [Fri, 9 Aug 2013 16:14:59 +0000 (09:14 -0700)]
Add `restrict`.

6 years agoPrepare an rc release and add the CHANGELOG.
Ashley Penney [Wed, 31 Jul 2013 18:04:03 +0000 (14:04 -0400)]
Prepare an rc release and add the CHANGELOG.

6 years agoMerge pull request #88 from apenney/restrict
Ashley Penney [Fri, 9 Aug 2013 16:29:26 +0000 (09:29 -0700)]
Merge pull request #88 from apenney/restrict

Add specs for restrict.

6 years agoAdd specs for restrict.
Ashley Penney [Fri, 9 Aug 2013 16:15:28 +0000 (09:15 -0700)]
Add specs for restrict.

6 years agoMerge pull request #87 from apenney/restrict
Ashley Penney [Thu, 8 Aug 2013 19:17:35 +0000 (12:17 -0700)]
Merge pull request #87 from apenney/restrict

Convert restrict to an array of restrictions.

6 years agoConvert restrict to an array of restrictions.
Ashley Penney [Thu, 8 Aug 2013 16:55:32 +0000 (09:55 -0700)]
Convert restrict to an array of restrictions.

Instead of a boolean with hardcoded values we now just convert
restrict into an array of lines related to restrictions.

6 years agoMerge pull request #80 from apenney/single_template
Ashley Penney [Wed, 31 Jul 2013 17:48:09 +0000 (10:48 -0700)]
Merge pull request #80 from apenney/single_template

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

6 years agoRewrite the spec testing.
Ashley Penney [Tue, 30 Jul 2013 17:01:14 +0000 (13:01 -0400)]
Rewrite the spec testing.

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.

6 years agoConvert some classes to not be parameterized.
Ashley Penney [Tue, 30 Jul 2013 16:58:59 +0000 (12:58 -0400)]
Convert some classes to not be parameterized.

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.

6 years agoAdd documentation for new parameters.
Ashley Penney [Tue, 30 Jul 2013 15:59:26 +0000 (11:59 -0400)]
Add documentation for new parameters.

6 years agoAdd preferred_servers feature.
Ashley Penney [Mon, 29 Jul 2013 21:25:36 +0000 (17:25 -0400)]
Add preferred_servers feature.

This adds:

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

As requested by Erik DalĂ©n!

6 years agoAdd tests for the new keys options.
Ashley Penney [Mon, 29 Jul 2013 21:08:44 +0000 (17:08 -0400)]
Add tests for the new keys options.

6 years agoRemove all the distribution specific templates.
Ashley Penney [Mon, 29 Jul 2013 21:07:40 +0000 (17:07 -0400)]
Remove all the distribution specific templates.

Add a single ntp.conf.erb as the standard template going forward,
to ease the maintenance burden of adding features to this module.

6 years agoAdd new parameters to allow more flexible configuration.
Ashley Penney [Mon, 29 Jul 2013 20:02:50 +0000 (16:02 -0400)]
Add new parameters to allow more flexible configuration.

`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.

6 years agoMerge pull request #79 from 3flex/fix-bug-number-typo
Ashley Penney [Mon, 22 Jul 2013 12:23:57 +0000 (05:23 -0700)]
Merge pull request #79 from 3flex/fix-bug-number-typo

correct anchor pattern bug number

6 years agocorrect anchor pattern bug number
Matthew Haughton [Sun, 21 Jul 2013 22:52:35 +0000 (18:52 -0400)]
correct anchor pattern bug number

6 years agoMerge pull request #75 from apenney/101-release 1.0.1
Hunter Haugen [Mon, 15 Jul 2013 22:16:00 +0000 (15:16 -0700)]
Merge pull request #75 from apenney/101-release

Prepare a quick 1.0.1 release to fix a quoting issue.

6 years agoPrepare a quick 1.0.1 release to fix a quoting issue.
Ashley Penney [Mon, 15 Jul 2013 15:07:07 +0000 (11:07 -0400)]
Prepare a quick 1.0.1 release to fix a quoting issue.

6 years agoMerge pull request #73 from gwis/update-deprecation-notice
Ashley Penney [Mon, 15 Jul 2013 15:03:11 +0000 (08:03 -0700)]
Merge pull request #73 from gwis/update-deprecation-notice

Correct deprecation notice to mention 'package_ensure'

6 years agoMerge pull request #72 from mmoll/virtual_panic
Ashley Penney [Mon, 15 Jul 2013 15:02:55 +0000 (08:02 -0700)]
Merge pull request #72 from mmoll/virtual_panic

fix panic parameter in virtual machines

6 years agoCorrect deprecation notice to mention 'package_ensure'
Gordon Stratton [Sun, 14 Jul 2013 18:03:00 +0000 (18:03 +0000)]
Correct deprecation notice to mention 'package_ensure'

6 years agofix panic parameter in virtual machines
Michael Moll [Sat, 13 Jul 2013 19:21:02 +0000 (21:21 +0200)]
fix panic parameter in virtual machines

As facts are always strings, quoting is required here.

6 years agoMerge pull request #71 from apenney/100-release 1.0.0
Hunter Haugen [Fri, 12 Jul 2013 18:39:41 +0000 (11:39 -0700)]
Merge pull request #71 from apenney/100-release

Prepare the 1.0.0 release.

6 years agoPrepare the 1.0.0 release.
Ashley Penney [Fri, 12 Jul 2013 14:11:11 +0000 (10:11 -0400)]
Prepare the 1.0.0 release.

6 years agoMerge pull request #69 from simonsd/master
Ashley Penney [Fri, 12 Jul 2013 13:03:46 +0000 (06:03 -0700)]
Merge pull request #69 from simonsd/master

Archlinux now also has an osfamily fact

6 years agofixup spec tests for Archlinux
Dave Simons [Fri, 12 Jul 2013 08:52:06 +0000 (10:52 +0200)]
fixup spec tests for Archlinux

Signed-off-by: Dave Simons <dave@inuits.eu>
6 years agoMerge pull request #70 from nanliu/cleanup
Ashley Penney [Thu, 11 Jul 2013 22:05:49 +0000 (15:05 -0700)]
Merge pull request #70 from nanliu/cleanup

Clean up README to use puppet highlight.

6 years agoClean up README to use puppet highlight.
Nan Liu [Thu, 11 Jul 2013 20:37:41 +0000 (13:37 -0700)]
Clean up README to use puppet highlight.

6 years agoMerge pull request #68 from apenney/rc-fixes
Ashley Penney [Wed, 10 Jul 2013 23:09:44 +0000 (16:09 -0700)]
Merge pull request #68 from apenney/rc-fixes

Formatting fixes for the rc

6 years agoUse scope.lookupvar for this to look in the right place.
Ashley Penney [Wed, 10 Jul 2013 20:17:16 +0000 (16:17 -0400)]
Use scope.lookupvar for this to look in the right place.

6 years agoFix extra blank line.
Ashley Penney [Wed, 10 Jul 2013 20:13:37 +0000 (16:13 -0400)]
Fix extra blank line.

6 years agoFix examples to use single quotes.
Ashley Penney [Wed, 10 Jul 2013 20:08:58 +0000 (16:08 -0400)]
Fix examples to use single quotes.

6 years agoRemove placeholder file.
Ashley Penney [Wed, 10 Jul 2013 20:07:49 +0000 (16:07 -0400)]
Remove placeholder file.

6 years agoEnsure the spacing between class and ( is consistent.
Ashley Penney [Wed, 10 Jul 2013 20:07:36 +0000 (16:07 -0400)]
Ensure the spacing between class and ( is consistent.

6 years agoArchlinux now also has osfamily fact
Dave Simons [Wed, 10 Jul 2013 19:58:06 +0000 (21:58 +0200)]
Archlinux now also has osfamily fact

Signed-off-by: Dave Simons <dave@inuits.eu>
6 years agoMerge pull request #67 from apenney/rc
Ashley Penney [Tue, 9 Jul 2013 21:45:19 +0000 (14:45 -0700)]
Merge pull request #67 from apenney/rc

Fix version.

6 years agoFix the travis secure field.
Ashley Penney [Tue, 9 Jul 2013 21:43:50 +0000 (17:43 -0400)]
Fix the travis secure field.

6 years agoFix version. 1.0.0-rc1
Ashley Penney [Tue, 9 Jul 2013 21:25:22 +0000 (17:25 -0400)]
Fix version.

6 years agoMerge pull request #66 from apenney/refactor-round-1
Ashley Penney [Tue, 9 Jul 2013 21:10:19 +0000 (14:10 -0700)]
Merge pull request #66 from apenney/refactor-round-1

WIP: Refactoring of NTP module

6 years agoBump to rc candidate.
Ashley Penney [Tue, 9 Jul 2013 21:08:36 +0000 (17:08 -0400)]
Bump to rc candidate.

6 years agoAdd panic as a new parameter in case people want to allow clock skews.
Ashley Penney [Tue, 9 Jul 2013 20:59:43 +0000 (16:59 -0400)]
Add panic as a new parameter in case people want to allow clock skews.

6 years agoFix up changelog.
Ashley Penney [Tue, 9 Jul 2013 20:29:28 +0000 (16:29 -0400)]
Fix up changelog.

6 years agoFix up travis for more testing.
Ashley Penney [Tue, 9 Jul 2013 20:27:59 +0000 (16:27 -0400)]
Fix up travis for more testing.

6 years agoAdd service checks.
Ashley Penney [Tue, 9 Jul 2013 20:24:55 +0000 (16:24 -0400)]
Add service checks.

6 years agoImprove the rspec-system tests, making sure we test for the package
Ashley Penney [Tue, 9 Jul 2013 20:06:03 +0000 (16:06 -0400)]
Improve the rspec-system tests, making sure we test for the package
being installed and the config file at least makes basic sense.

6 years agoAdd some basic tests.
Ashley Penney [Tue, 9 Jul 2013 16:22:18 +0000 (12:22 -0400)]
Add some basic tests.

6 years agoAdd rspec-system framework.
Ashley Penney [Tue, 9 Jul 2013 15:50:43 +0000 (11:50 -0400)]
Add rspec-system framework.

6 years agoRewrite the README and prepare the CHANGELOG.
Ashley Penney [Tue, 9 Jul 2013 15:28:22 +0000 (11:28 -0400)]
Rewrite the README and prepare the CHANGELOG.

6 years agoRename parameters, remove outdated documentation, and adds inherit to
Ashley Penney [Tue, 9 Jul 2013 15:27:53 +0000 (11:27 -0400)]
Rename parameters, remove outdated documentation, and adds inherit to
ntp on the child classes.

6 years agoRewrite the spec tests to cover the 4 different classes and improve a
Ashley Penney [Tue, 9 Jul 2013 15:27:17 +0000 (11:27 -0400)]
Rewrite the spec tests to cover the 4 different classes and improve a
few missing gaps in the testing.

6 years agoEnsure the rename is done everywhere and wrap the service in a
Ashley Penney [Mon, 8 Jul 2013 14:29:14 +0000 (10:29 -0400)]
Ensure the rename is done everywhere and wrap the service in a
manage_service param.

6 years agoRename package_ensure to ensure_package.
Ashley Penney [Mon, 8 Jul 2013 14:29:01 +0000 (10:29 -0400)]
Rename package_ensure to ensure_package.
Add the anchor pattern.
Move the deprecation warning out of params to init.

6 years agoAdd Gentoo support. (And reformat archlinux vars)
Ashley Penney [Fri, 5 Jul 2013 23:18:20 +0000 (19:18 -0400)]
Add Gentoo support. (And reformat archlinux vars)

6 years agoFix specs now things are renamed.
Ashley Penney [Fri, 5 Jul 2013 22:52:21 +0000 (18:52 -0400)]
Fix specs now things are renamed.

6 years agoSome syntax fixes as well as deprecate autoupdate.
Ashley Penney [Fri, 5 Jul 2013 22:52:04 +0000 (18:52 -0400)]
Some syntax fixes as well as deprecate autoupdate.

6 years agoEnsure that users can pass in templates from outside of the ntp module.
Ashley Penney [Fri, 5 Jul 2013 22:19:12 +0000 (18:19 -0400)]
Ensure that users can pass in templates from outside of the ntp module.

6 years agoRework specs to pass with renamed params.
Ashley Penney [Fri, 5 Jul 2013 22:17:02 +0000 (18:17 -0400)]
Rework specs to pass with renamed params.

6 years agoRename all the servers_real functions to servers.
Ashley Penney [Fri, 5 Jul 2013 21:56:25 +0000 (17:56 -0400)]
Rename all the servers_real functions to servers.

6 years agoAdd ntp::service, a class to manage the ntp service.
Ashley Penney [Fri, 5 Jul 2013 21:56:14 +0000 (17:56 -0400)]
Add ntp::service, a class to manage the ntp service.

6 years agoRefactor out the main ntp class to break it up into 4 smaller ones.
Ashley Penney [Fri, 5 Jul 2013 21:56:01 +0000 (17:56 -0400)]
Refactor out the main ntp class to break it up into 4 smaller ones.

6 years agoAdd ntp::params, a place to centralize all configuration information.
Ashley Penney [Fri, 5 Jul 2013 21:55:41 +0000 (17:55 -0400)]
Add ntp::params, a place to centralize all configuration information.

6 years agoAdd ntp::install, a class to manage the ntp packages.
Ashley Penney [Fri, 5 Jul 2013 21:55:31 +0000 (17:55 -0400)]
Add ntp::install, a class to manage the ntp packages.

6 years agoAdd ntp::config, a class to manage the ntp configuration file.
Ashley Penney [Fri, 5 Jul 2013 21:55:16 +0000 (17:55 -0400)]
Add ntp::config, a class to manage the ntp configuration file.

6 years agoMerge pull request #62 from c00w/master
Hunter Haugen [Tue, 11 Jun 2013 00:20:38 +0000 (17:20 -0700)]
Merge pull request #62 from c00w/master

Fix NTP templates to use @

6 years agoUser @servers_real instead of servers_real to avoid warnings
Colin Rice [Sat, 25 May 2013 20:04:41 +0000 (16:04 -0400)]
User @servers_real instead of servers_real to avoid warnings

6 years agoMerge pull request #54 from puppetlabs/spec_test/pull_49
Ryan Coleman [Thu, 4 Apr 2013 20:32:44 +0000 (13:32 -0700)]
Merge pull request #54 from puppetlabs/spec_test/pull_49

Add test for virtual machines and local clocks

6 years agoMerge pull request #49 from alexjfisher/feature/master/disable_local_clock_for_vms
Ryan Coleman [Thu, 4 Apr 2013 20:32:15 +0000 (13:32 -0700)]
Merge pull request #49 from alexjfisher/feature/master/disable_local_clock_for_vms

Omit configuration for a local clock as time source if running on a VM.

6 years agoAdd test for virtual machines and local clocks
Ryan Coleman [Thu, 4 Apr 2013 20:27:49 +0000 (13:27 -0700)]
Add test for virtual machines and local clocks

This commit provides a spec test for pull request #49 and commit
01273c53f1cf2015c3ff5a9f704828225d900e03 which specifies that virtual
machines should not use the local clock. This test attempts to protect
against a regression on that statement.

6 years agoMerge pull request #53 from puppetlabs/release_0.3.0
Ryan Coleman [Thu, 4 Apr 2013 18:08:56 +0000 (11:08 -0700)]
Merge pull request #53 from puppetlabs/release_0.3.0

Release version 0.3.0

6 years agoRelease version 0.3.0 0.3.0
Ryan Coleman [Thu, 4 Apr 2013 18:04:59 +0000 (11:04 -0700)]
Release version 0.3.0

Release 0.3.0 includes fixes to style, a couple bug fixes and adds
support for Arch Linux by way of Matt Rogers.

6 years agoMerge pull request #52 from puppetlabs/travis_update
Ryan Coleman [Thu, 4 Apr 2013 18:00:59 +0000 (11:00 -0700)]
Merge pull request #52 from puppetlabs/travis_update

Update Travis.YML

6 years agoUpdate Travis.YML
Ryan Coleman [Thu, 4 Apr 2013 17:53:43 +0000 (10:53 -0700)]
Update Travis.YML

This commit updates to a more modern test matrix and adds the
configuration necessary to publish in an automated fashion.

6 years agoMerge pull request #47 from frimik/feature-19418-ntp-template
Adrien Thebo [Fri, 8 Mar 2013 17:19:59 +0000 (09:19 -0800)]
Merge pull request #47 from frimik/feature-19418-ntp-template

ntp: fixes #19418 - allow template override

6 years agofixes #19418 - missing fixtures for spec tests
Mikael Fridh [Fri, 8 Mar 2013 11:38:09 +0000 (12:38 +0100)]
fixes #19418 - missing fixtures for spec tests

6 years agoOmit configuration for a local clock as time source if running on a VM.
Alexander Fisher [Wed, 27 Feb 2013 18:35:53 +0000 (18:35 +0000)]
Omit configuration for a local clock as time source if running on a VM.

Quoting http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1006427
'It is also important not to use the local clock as a time source, often referred to as the Undisciplined Local Clock.'

6 years agoMerge branch 'mattr--feature/add-archlinux-support'
Jeff McCune [Mon, 25 Feb 2013 23:28:06 +0000 (15:28 -0800)]
Merge branch 'mattr--feature/add-archlinux-support'

* mattr--feature/add-archlinux-support:
  Add support for Arch Linux

closes #40

6 years agoAdd support for Arch Linux
Matt Rogers [Fri, 18 Jan 2013 04:57:17 +0000 (22:57 -0600)]
Add support for Arch Linux

Add test for package name and presence

Fix bad package name for Arch Linux

Fix missing comment in config template

6 years agoMerge pull request #48 from richardc/patch-1
Ken Barber [Mon, 25 Feb 2013 20:07:14 +0000 (12:07 -0800)]
Merge pull request #48 from richardc/patch-1

Restrict the versions and add 3.1

6 years agoRestrict the versions and add 3.1
Richard Clamp [Mon, 25 Feb 2013 20:04:40 +0000 (20:04 +0000)]
Restrict the versions and add 3.1

~> 2.6 will match 2.7

6 years agontp: fixes #19418 - allow template override
Mikael Fridh [Sat, 23 Feb 2013 00:17:54 +0000 (01:17 +0100)]
ntp: fixes #19418 - allow template override

This allows a template to be explicitly set.

6 years agoMerge pull request #44 from puppetlabs/readme_update
Ryan Coleman [Thu, 14 Feb 2013 17:14:33 +0000 (09:14 -0800)]
Merge pull request #44 from puppetlabs/readme_update

Update Documentation and Purge Extras

6 years agoUpdate Documentation and Purge Extras
Ryan Coleman [Wed, 13 Feb 2013 19:26:52 +0000 (11:26 -0800)]
Update Documentation and Purge Extras

Commit message from laurenrother
Before alterations, this content was the module author-determined
description of and instructions for use of the module.

As part of a joint Forge/Docs team effort to standardize formatting and
encourage quality module documentation, a best practices README
template was created via internal and external user testing. That
template was then applied to this module.

I pulled in content from the original README on GitHub as well as the
Forge Module Description. Standard headings were added (Overview,
Module Description, Setup, Usage,
Implementation, etc.) to organize content, existent content was moved
under its appropriate heading and edited for tone/flow/clarity, and
basic formatting was done to
adhere to template standards.

Extraneous, empty READMEs were deleted.

6 years agoMerge pull request #42 from blkperl/update_travis
Ken Barber [Sun, 3 Feb 2013 01:50:37 +0000 (17:50 -0800)]
Merge pull request #42 from blkperl/update_travis

Update travis and gemfile to puppetlabs standard

6 years agoAdd build status to the README
William Van Hevelingen [Sun, 3 Feb 2013 01:50:05 +0000 (17:50 -0800)]
Add build status to the README

6 years agoUpdate travis and gemfile to puppetlabs standard
William Van Hevelingen [Sun, 3 Feb 2013 01:46:05 +0000 (17:46 -0800)]
Update travis and gemfile to puppetlabs standard

6 years agoMerge pull request #39 from mmoll/fix_cp_error
Nan Liu [Tue, 11 Dec 2012 21:52:19 +0000 (13:52 -0800)]
Merge pull request #39 from mmoll/fix_cp_error

fix copy/paste error in spec file

6 years agofix copy/paste error in spec file
Michael Moll [Tue, 11 Dec 2012 21:46:13 +0000 (22:46 +0100)]
fix copy/paste error in spec file

6 years agoMerge pull request #38 from puppetlabs/contributing_guide
Ryan Coleman [Tue, 11 Dec 2012 01:08:19 +0000 (17:08 -0800)]
Merge pull request #38 from puppetlabs/contributing_guide

Add CONTRIBUTING.md

6 years agoAdd CONTRIBUTING.md
Ryan Coleman [Mon, 10 Dec 2012 23:28:20 +0000 (15:28 -0800)]
Add CONTRIBUTING.md

This commit adds a brief contributing guide that really links back
to the wiki page hosted on projects.puppetlabs.com. This file was
added mainly for the GitHub functionality described in this blog
post: https://github.com/blog/1184-contributing-guidelines

6 years agoMerge pull request #37 from puppetlabs/doh/nrosier/patch-1
Ryan Coleman [Mon, 10 Dec 2012 23:18:12 +0000 (15:18 -0800)]
Merge pull request #37 from puppetlabs/doh/nrosier/patch-1

Update package-format for support of FreeBSD 9.x

6 years agoUpdate package-format for support of FreeBSD 9.x
Ryan Coleman [Mon, 10 Dec 2012 23:11:24 +0000 (15:11 -0800)]
Update package-format for support of FreeBSD 9.x

This commit comes to you via nrosier but I created a merge conflict
with my latest merge and already bothered him with a rebase once.

6 years agoMerge pull request #29 from mmoll/osfamily
Ryan Coleman [Mon, 10 Dec 2012 23:07:10 +0000 (15:07 -0800)]
Merge pull request #29 from mmoll/osfamily

switch to the 'osfamily' fact

6 years agoMerge pull request #33 from codingtony/master
Ryan Coleman [Mon, 10 Dec 2012 21:34:21 +0000 (13:34 -0800)]
Merge pull request #33 from codingtony/master

Make service ntp started on boot -> service 'ntp' { enable=>$enable...

6 years agoMerge remote-tracking branch 'origin_master/master'
Tony Bussieres [Mon, 10 Dec 2012 21:24:52 +0000 (16:24 -0500)]
Merge remote-tracking branch 'origin_master/master'

Conflicts:
manifests/init.pp