summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | (#8037) Fix incorrect example in Augeas type referencenfagerlund2011-08-171-11/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The changes attribute for the Augeas type's second example was incorrect, as it had leading slashes that took the paths out of the context of /files. This commit fixes the bad example, and changes the doc string to a heredoc to eliminate some messy escaping.
* | | | Merge branch '2.7.x'Nick Lewis2011-08-161-3/+5
|\| | |
| * | | Merge branch 'ticket/2.7.x/5495' into 2.7.xNick Lewis2011-08-161-3/+5
| |\ \ \
| | * | | Fix posix exec provider spec failures on WindowsNick Lewis2011-08-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs were assuming that paths such as /foo were always absolute, which is not the case on Windows. Thus, when run on Windows, the provider was complaining about receiving relative paths when it expected absolute, rather than succeeding or failing in the intended way. Now we expand all paths we want to be absolute, to guarantee they will be absolute everywhere. Also, some specs were failing because they were trying to test the case where a file isn't executable. That's not something we can reliably check on Windows, so instead just stub the appropriate executable? methods. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
* | | | | Merge branch '2.7.x'Nick Lewis2011-08-166-134/+142
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/puppet/provider/augeas/augeas.rb spec/unit/node_spec.rb
| * | | | Merge branch 'ticket/2.7.x/5495' into 2.7.xNick Lewis2011-08-162-121/+120
| |\| | |
| | * | | (#5495) Remove dead Windows-specific code from posix exec providerNick Lewis2011-08-162-121/+120
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this provider only applies when the posix feature is present (and thus not the windows feature), it can never be used on Windows. Thus, the Windows-specific command handling is unnecessary and unused. Also added more specific error messages for the cases where a command doesn't exist, isn't a file, and isn't executable. These only apply when the command path is absolute (otherwise the message is simply command not found). Reviewed-By: Matt Robinson <matt@puppetlabs.com>
| * | | Merge pull request #40 from jhelwig/fix-order-dependent-terminus-tests-in-2.7.xDaniel Pittman2011-08-163-8/+12
| |\ \ \ | | | | | | | | | | Fix order dependent terminus tests in 2.7.x
| | * | | Do not leak indirector state from apply testsJacob Helwig2011-08-153-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the indirector state persists across tests, we were seeing order dependent test failures with tests that assumed the default indirector settings. Specifically, if the following tests were run in order, the first would cause failures in the second two: spec/unit/application/apply_spec.rb spec/unit/node_spec.rb spec/integration/node_spec.rb To protect against this state leakage, we now: - reset the Puppet::Node terminus before each test in spec/integration/node_spec.rb to ensure we are testing a clean environment. - reset the Puppet::Node, and Puppet::Node::Facts terminus, and cache class after each test in spec/unit/application/apply_spec.rb to prevent leakage into other tests. Since the cache class has the same state leakage problem as the terminus class, but does not have the same ability to lazily populate the default when set to nil, we remove the test. Testing the default for the cache class would require running the test before all other tests to ensure there is no state pollution.n
| * | | | Merge pull request #39 from nfagerlund/ticket/2.7.x/8612_exec_creates_parameterDaniel Pittman2011-08-161-7/+10
| |\ \ \ \ | | |/ / / | |/| | | Ticket/2.7.x/8612 exec creates parameter
| | * | | (#8612) Clarify the function of the example for exec's "creates" parameternfagerlund2011-08-151-7/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | It was not clear to all readers that /var/tmp/myfile was being extracted from the tarball. This commit adds a sentence to make the conditions when the exec will run more explicit and fixes an error in the tar command.
| * | | Merge pull request #22 from domcleal/tickets/2.7.x/8808Daniel Pittman2011-08-122-3/+19
| |\ \ \ | | | | | | | | | | (#8808) Fail Augeas resource when unable to save changes
| | * | | (#8808) Fail Augeas resource when unable to save changesDominic Cleal2011-08-062-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Raise a failure when Augeas changes cannot be saved (due to invalid layout of the tree, permissions etc). Fixes a regression.
* | | | | maint: Fix order dependent spec failureMatt Robinson2011-08-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the cacher was removed in master the indirection's terminus class no longer gets reset between tests by clearing the cache. This meant that one spec was setting the cache_class and affecting another spec, causing failures. Now that test manually resets its indirection related info. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
* | | | | Merge branch '2.7.x'Matt Robinson2011-08-1534-870/+730
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.x: (25 commits) (#4411) Explain that runinterval = 0 does not mean "never run" Maint: Fix missing option text in puppet agent and arrange options alphabetically (#8302) Improve documentation of exec providers (#7853) Clarify and complete docs for the tagmail report processor Maint: Mention that audit metaparameter will accept "all" Maint: Adjust wording for file type's content parameter Maint: Fix poor documentation for versioncmp function. maint: Fix case sensitive require maint: Add inspect app options to help maint: Fix inspect help Increment lib/puppet.rb VERSION string Updated CHANGELOG for 2.7.3rc1 (#4762) Ensure that clients on the moon can successfully connect. Add document outlining preferred contribution methods Add document outlining preferred contribution methods Add document outlining preferred contribution methods Revert "Merge branch 'vcsrepo'" Revert "Merge branch 'vcsrepo'" Updating CHANGELOG for 2.7.2rc3 (#8704) Give better errors for invalid fileserver.conf ... Manually Resolved Conflicts: lib/puppet/parser/functions/versioncmp.rb spec/integration/node/facts_spec.rb
| * | | | Merge pull request #29 from nfagerlund/maint/2.7.x/minor_docs_fixesDaniel Pittman2011-08-102-30/+33
| |\ \ \ \ | | | | | | | | | | | | Maint/2.7.x/minor docs fixes
| | * | | | (#4411) Explain that runinterval = 0 does not mean "never run"nfagerlund2011-08-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike several other tools that accept a number of seconds between runs, puppet agent doesn't use 0 as a special value representing "never;" instead, it takes this as an instruction to run continuously. As this has caused some user confusion, this commit updates runinterval's description to explain this, and points to the correct method to make puppet agent do nothing.
| | * | | | Maint: Fix missing option text in puppet agent and arrange options ↵nfagerlund2011-08-101-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alphabetically Puppet agent's man text was missing the --no-client option in its command synopsis, and the long text for --no-client cut off weirdly in the middle of a sentence. This commit fixes both problems, and arranges all the options alphabetically so they're easier to reference.
| * | | | | Merge branch '2.6.x' into 2.7.xMatt Robinson2011-08-102-5/+17
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * 2.6.x: (#8302) Improve documentation of exec providers Add document outlining preferred contribution methods
| | * | | | Merge pull request #26 from nfagerlund/ticket/2.6.x/8302_exec_provider_docsDaniel Pittman2011-08-102-5/+17
| | |\ \ \ \ | | | |_|_|/ | | |/| | | Ticket/2.6.x/8302 exec provider docs
| | | * | | (#8302) Improve documentation of exec providersnfagerlund2011-08-102-5/+17
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for the shell and posix providers didn't fully explain the differences between them or the security implications of each. This commit improves the documentation of both providers.
| | * | | Add document outlining preferred contribution methodsJacob Helwig2011-08-021-0/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically had the preferred contribution process on the Redmine wiki, however this is not obvious to people that don't already know it is there. By adding this document to the repository itself, it becomes much easier for new contributors to find what the preferred contribution methods are. By having the preferred contribution method in the repository also means that it becomes a "curated" document, which must go through the same submission/review process that other changes to the repositories go through. Reviewed-by: Nick Fagerlund <nick.fagerlund@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | | Merge pull request #24 from nfagerlund/maint/2.7.x/misc_doc_fixesJeff McCune2011-08-094-21/+32
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint/2.7.x/misc_doc_fixes' into 2.7.x * maint/2.7.x/misc_doc_fixes: (#7853) Clarify and complete docs for the tagmail report processor Maint: Mention that audit metaparameter will accept "all" Maint: Adjust wording for file type's content parameter Maint: Fix poor documentation for versioncmp function.
| | * | | (#7853) Clarify and complete docs for the tagmail report processornfagerlund2011-08-091-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tagmail report docs did not mention that you could use log levels as tags, and was unclear in several other minor ways. This commit improves that documentation.
| | * | | Maint: Mention that audit metaparameter will accept "all"nfagerlund2011-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Previously, `audit => all` wasn't documented anywhere. This commit adds a note on it to the metaparameter reference.
| | * | | Maint: Adjust wording for file type's content parameternfagerlund2011-08-091-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content parameter's doc string said: "The primary purpose of this parameter is to provide a kind of limited templating... This attribute is especially useful when used with templating." This commit clarifies said awkward wording.
| | * | | Maint: Fix poor documentation for versioncmp function.nfagerlund2011-08-091-6/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | The versioncmp function's documentation was missing punctuation and was unnecessarily vague. This commit clarifies the return data and makes the documentation more legible at a glance.
| * | | Merge branch 'ticket/2.7.x/maint-fix_inspect_help' into 2.7.xMatt Robinson2011-08-092-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/maint-fix_inspect_help: maint: Fix case sensitive require
| | * | | maint: Fix case sensitive requireMatt Robinson2011-08-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac's filesystems aren't case sensitive, so developing this change didn't catch the issue with requiring filenames that had been uppercased. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | | Merge branch 'ticket/2.7.x/maint-fix_inspect_help' into 2.7.xMatt Robinson2011-08-093-6/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/maint-fix_inspect_help: maint: Add inspect app options to help maint: Fix inspect help
| | * | | maint: Add inspect app options to helpMatt Robinson2011-08-091-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspect wasn't documenting the only two options it has, archive_files and archive_file_server. Now it does. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| | * | | maint: Fix inspect helpMatt Robinson2011-08-092-5/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `puppet help inspect` did not result in help: Unable to find application 'inspect'. err: exit err: Try 'puppet help help help' for usage It turned out that the only reason applications were getting required so that their help could be found was the LegacyName conversion table in lib/puppet/util/command_line.rb:7. Inspect never had a legacy name, so the help system couldn't find it since it never got required. Now instead of checking for the class constant to see if the application has been loaded, we try to require the application and exit if it's not found. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | Increment lib/puppet.rb VERSION stringMichael Stahnke2011-08-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| * | | Updated CHANGELOG for 2.7.3rc1Michael Stahnke2011-08-051-6/+60
| | | |
| * | | Merge branch '2.7.x' into 2.7rcMichael Stahnke2011-08-0592-355/+2486
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #21 from ↵Nick Lewis2011-08-041-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | daniel-pittman/bug/2.7.x/4762-ensure-that-clients-on-the-moon-can-successfully-connect Bug/2.7.x/4762 ensure that clients on the moon can successfully connect
| | | * | (#4762) Ensure that clients on the moon can successfully connect.Daniel Pittman2011-08-041-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we only allowed Puppet Clients at a maximum distance of somewhere between 7,494 and 14,988 kilometers from the master, depending on the variance in local conditions. While this gave us good data security against hostile clients connecting from the dark side of the moon, real world testing shows the moon folks are likely to just take over a local staging host and attack that way. So, instead, allow clients sufficient time they should be comfortable able to connect to a master from the moon. We still refuse clients further out, like Mars, since it seems unlikely that Puppet management over that distance should work. We advise the manned Mars expedition to deploy a local Puppet Master to manage infrastructure in their base, and to watch out for the martians.
| | * | Add document outlining preferred contribution methodsJacob Helwig2011-08-021-0/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have historically had the preferred contribution process on the Redmine wiki, however this is not obvious to people that don't already know it is there. By adding this document to the repository itself, it becomes much easier for new contributors to find what the preferred contribution methods are. By having the preferred contribution method in the repository also means that it becomes a "curated" document, which must go through the same submission/review process that other changes to the repositories go through. Reviewed-by: Nick Fagerlund <nick.fagerlund@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| | * | Revert "Merge branch 'vcsrepo'"Jacob Helwig2011-08-027-763/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vcsrepo is available in a module of its own, is missing tests, and goes against the long-term goal of moving "extra" types out of core puppet into modules (an example of this is the nagios types). This reverts commit 25b967559dfa39eb094008c7a3952c4ee885530b, reversing changes made to b87a1dea704ed981f2f0af728afac2c63e87b5a8. Reviewed-by: Michael Stahnke <mike@puppetlabs.com>
| | * | Merge branch '2.7rc' into 2.7.xMichael Stahnke2011-07-291-0/+4
| | |\ \
| | * \ \ Merge branch 'ticket/2.7.x/8704-fileserverconf_parse_errors' into 2.7.xMatt Robinson2011-07-292-0/+35
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/8704-fileserverconf_parse_errors: (#8704) Give better errors for invalid fileserver.conf
| | | * | | (#8704) Give better errors for invalid fileserver.confMatt Robinson2011-07-292-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you tried to just put an allow or deny line in the fileserver.conf without a mount point, you got a really confusing error message: lib/puppet/network/handler/fileserver.rb:285:in `readconfig': undefined method `info' for nil:NilClass (NoMethodError) Now instead we give an error saying no mount point was specified. Reviewed-by: Josh Cooper <josh@puppetlabs.com>
| | * | | | Merge branch 'tickets/2.7.x/1886' into 2.7.xPieter van de Bruggen2011-07-282-112/+115
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.7.x/1886: (Maint.) Disable cleaning of storeconfigs.
| | | * | | | (Maint.) Disable cleaning of storeconfigs.Pieter van de Bruggen2011-07-282-112/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature (and the corresponding tests) were causing intermittent failures which we were unable to trace. We will reintroduce this behavior when we can do so without test fragility. Reviewed-By: Matt Robinson
| | * | | | | (#8690) Accept 'global' options in Puppet FacesDaniel Pittman2011-07-282-1/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we introduced verification of options, we forgot to handle the case that global options from the Puppet settings system could be passed to the face. This, in turn, means that the system would fail if you used any of those. This remediates that, and now these work as expected. Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>
| | * | | | Merge branch 'tickets/2.7.x/1886' into 2.7.xPieter van de Bruggen2011-07-281-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tickets/2.7.x/1886: (Maint.) Fix spec failures related to leaking state.
| | | * | | | (Maint.) Fix spec failures related to leaking state.Pieter van de Bruggen2011-07-281-0/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `node clean` code has introduced a systematic change in state which is not uniformly protected against by the tests. As these order dependent failures arise, we should refactor the tests to be more robust. Reviewed-By: Matt Robinson
| | * | | | Merge branch 'feature/2.7.x/1886' into 2.7.xPieter van de Bruggen2011-07-289-37/+518
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * feature/2.7.x/1886: (#1886) Clean up `node clean` for merge. Fix #1886 - Add node cleanup capability
| | | * | | (#1886) Clean up `node clean` for merge.Pieter van de Bruggen2011-07-285-138/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes various style changes, and assorted fixes to testing. Paired-With: Matt Robinson
| | | * | | Fix #1886 - Add node cleanup capabilityPeter Meier2011-07-277-20/+500
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here is a changeset that adds a new action to the puppet node face. This application removes all traces of a node on the puppetmaster (including certs, cached facts and nodes, reports, and storedconfig entries). Furthermore it is capable of unexporting exported resources of a host so that consumers of these resources can remove the exported resources and we will safely remove the node from our infrastructure. Usage: puppet node clean [--unexport] <host> [<host2> ...] To achieve this we add different destroy methods to the different parts of the indirector. So for example for yaml indirections we already offer read access for the yaml, this changeset adds the destroy handler which only removes the yaml file for a request. This can be used to remove cached entries. This work is based on the initial work of Brice Figureau <brice-puppet@daysofwonder.com>