summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Remove pending copy of an active acceptance testNick Lewis2011-06-091-50/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was introduced as pending in 2.6.x, and active in 2.7.x. When 2.6.x was merged to 2.7.x, the pending version was merged along as well, causing no visible conflicts. It's obviously not pending, so remove it. Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
* | | | | Merge branch '2.7.x'Nick Lewis2011-06-08101-1077/+4261
|\| | | |
| * | | | Merge branch '2.7rc' into 2.7.xNick Lewis2011-06-0875-593/+3556
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated CHANGELOG for 2.7.0rc4Michael Stahnke2011-06-081-0/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| | * | | Merge branch 'maint/2.7rc/static_manpages' into 2.7rcnfagerlund2011-06-0841-288/+2922
| | |\ \ \
| | | * | | Maint: Update static man pages for 2.7.0nfagerlund2011-06-0840-277/+2879
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the static man pages for the final 2.7.0 release. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | | * | | Maint: Update static man page generator for Faces.nfagerlund2011-06-081-11/+43
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The man page updater wasn't making man pages for the new Faces app. This commit gives it that capability, and handles the name collision on puppet resource. Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| | * | | Merge branch 'ticket/2.7rc/7833-further_help_adjustments' into 2.7rcnfagerlund2011-06-0811-32/+75
| | |\ \ \
| | | * | | (#7833) Several help text/template editsnfagerlund2011-06-0811-32/+75
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes the following changes: * Changes wrapping on some "returns" blocks to accomodate the way we prepend "RETURNS: " to the first line in short help. * Overrides description for save on faces where save is invalid. (Since save has an inherited description, the description was contradicting the summary.) * Adds notes on dummy arguments to short_description where applicable, so as to show up in short help. * Adds the termini list to the action short help template. * Removes the authors block from short help for faces. (Save it for the man page.) * Several trivial wording changes. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | * | | maint: more work on regexp matching in Test::Unit assertions.Daniel Pittman2011-06-071-5/+3
| | | | |
| | * | | maint: acceptance tests need to search for bin/falseDaniel Pittman2011-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Because Mac and Linux systems hide bin/false in different places, we should have the catalog we are testing with search for it in the candidate places.
| | * | | Merge branch 'bug/2.7rc/7828-face-synopsis-generators-ram-options-together' ↵Daniel Pittman2011-06-074-42/+67
| | |\ \ \ | | | | | | | | | | | | | | | | | | into 2.7rc
| | | * | | (#7828) Fix whitespace in synopsis generator.Daniel Pittman2011-06-074-42/+67
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We accidentally omitted whitespace between multiple options while building the synopsis. This fixes that, by introducing a breakable space in the right location. Additionally, we extract the code that was 99 percent identical from the face and action synopsis generators, push it down into the documentation module, and then invoke it from both places. This eliminates the duplicate code, allowing me to fix that bug once and have it apply to both parts of the code; this is pretty much assured to be true any time we change the synopsis generation. Reviewed-By: Nick Fagerlund <nick.fagerlund@puppetlabs.com>
| | * | | maint: handle incoherent Test::Unit assertions.Daniel Pittman2011-06-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, it turns out that the 1.8.7 Test::Unit assertions are a bit quirky. If we use 'assert_match' it will turn a String into a regular expression by passing it through Regexp.quote automatically. If you use 'assert_no_match', though, it will not do that. It will just complain that it isn't a Regexp and blow up. So, we manually quote outside the assertion in both cases, and things should just work.
| | * | | Merge branch 'feature/2.7rc/6873-add-static-compiler' into 2.7rcDaniel Pittman2011-06-071-0/+137
| | |\ \ \
| | | * | | (#6873) Add Static Compiler terminus to 2.7.0Luke Kaines2011-06-071-0/+137
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the static compiler terminus to the release. This wraps the default compiler terminus, and post-processes the catalog to rewrite every file reference using the 'puppet://' URI/protocol into filebucket references that use the MD5 checksum of the file contents. This provides a genuinely static catalog, in terms of content: there are no external dependencies that can change to make the behaviour of applying this catalog change. It also eliminates the describe calls from file checking, as all the metadata is stored locally in the catalog. This can be a substantial performance increase for nodes, especially those that manage large trees of recursive files. To use this set the `catalog_terminus` to `static_compiler`; the resultant catalog will then reference only static content. This does not, however, put the required files into the filebucket on the client. There are some limitations of this code: * Files are all read into memory rather than streamed. This will definitely cause problems with large files, but the filebucket doesn't currently handle streaming. * We think the recursion behavior is equivalent, but can't really guarantee it without a good bit of testing. * You have to populate the client filebucket manually. We don't have any support for doing this automatically, not even through variant access to the catalog downloader. * Behavior on the server is currently undefined if your puppet masters are behind a load balancer and they're configured to do fileserving through that load balancer. It should work, but it probably won't be that fast. You can see https://github.com/lak/puppet-static-compiler for the original prototype this was inherited from, which includes some example code for scanning the downloaded catalog and fetching resources into the filebucket. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| | * | | Merge branch 'bug/2.7rc/7728-resource-failure-leads-to-extra-warnings' into ↵Daniel Pittman2011-06-074-4/+40
| | |\ \ \ | | | | | | | | | | | | | | | | | | 2.7rc
| | | * | | (#7728) Acceptance test for whit notifications.Daniel Pittman2011-06-071-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an acceptance test to verify that we emit the expected logs, but none of the unexpected logs, when we process a manifest showing the whit notification problem. Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com> Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | (#7728) Suppress notifications from container whits.Daniel Pittman2011-06-071-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced changes to our graph to reduce the number of edges when we had container dependencies. As part of this the 'whit' object was created, and used as an intermediate vertex to simplify processing. During that change we introduced additional reporting, based on those whit objects, about containment relationships during resource application failure. Specifically, we would now report that the containing class(es) and stages of any failed resource were failed, point-blank. This was unclear, because the entire class had not failed, but only part of it, but also unhelpful, because it turned a single failure into at least one additional report that contained no additional information. Now, instead, we suppress reporting for the whit resources. We still process them identically; just the report is eliminated. It isn't absolutely clear that this is the correct long term direction for handling these objects, but it is the minimal change for the RC release. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | maint: remove an unhelpful pending test.Daniel Pittman2011-06-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been pending approximately forever, and adds little value; removing the warning reduces noise without value.
| | | * | | maint: fix misnamed acceptance test for #7139Daniel Pittman2011-06-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Just s/\.rm/\.rb/ on the filename.
| | * | | | Merge branch 'ticket/2.7rc/7764-Faces_help_revisions' into 2.7rcnfagerlund2011-06-0724-237/+278
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | (#7764, 7775, 7778) Revisions to Faces help textnfagerlund2011-06-0723-209/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per UX review of help text, this commit makes several changes over the breadth of the Faces help: * Preface API-only action summaries/descriptions with "API only." (issue #7775) * Provide both CLI and API info in "returns," with the CLI info first. (issue #7778) * Summaries should be sentences. (Add punctuation.) * First sentences of descriptions should reiterate summaries. (Summaries and descriptions should be displayed far enough apart that this isn't a problem.) * Standardize on "subcommand" instead of "face" when talking about the entity you invoke at the command line. (Use "face" when describing API use.) * Fix outdated or clunky text in several faces.
| | | * | | (#7773, 7776, 7764) Several help template tweaksnfagerlund2011-06-074-30/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per UX review of help output, this commit makes several changes to templates and shared help text: * Change "unknown" to "undocumented" * Remove copyright from short help * Point readers to the man pages (issue 7773) * Remove examples from short help (issue 7776) * Remove summary from short help and make it a fallback for description * Edit common option summaries to fit on a single 80-col line
| * | | | Merge branch '2.6.x' into 2.7.xNick Lewis2011-06-0826-484/+705
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb lib/puppet/application/apply.rb lib/puppet/configurer.rb lib/puppet/configurer/fact_handler.rb spec/unit/application/apply_spec.rb spec/unit/configurer/fact_handler_spec.rb spec/unit/configurer_spec.rb
| | * | | Merge branch 'ticket/2.6.x/2128_docstrings' into 2.6.xJeff McCune2011-06-081-7/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/2128_docstrings: (#2128) Add WARNING for node_name_{fact,value} descriptions (#2128) Whitespace only reflow commit (#2128) In-line docs for node_name_{fact,value}
| | | * | | (#2128) Add WARNING for node_name_{fact,value} descriptionsJeff McCune2011-06-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor change to add a WARNING string as per feedback from UX. Reviewed-by: Randall Hansen <randall@puppetlabs.com>
| | | * | | (#2128) Whitespace only reflow commitJeff McCune2011-06-081-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of puppet --genconfig was showing a blank line between the description of the option and the default value line. This is because of the here document being used in the first commit. This change replaces the HERE document with a normal string that does not contain a final newline. In addition, the indentation of one of the default options was using 4 spaces instead of 2 and this has been corrected.
| | | * | | (#2128) In-line docs for node_name_{fact,value}Jeff McCune2011-06-081-2/+14
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change augments the in-line documentation for the node_name_fact and node_name_value configuration settings. These settings will not work effectively without additional changes elsewhere in the system, e.g. to auth.conf. In order to help the end user land softly if they choose to change these settings, a short link URL we control and can redirect has been added to each setting. These currently point to the community Wiki but may be redirected to docs.puppetlabs.com in the future.
| | * | | Merge branch 'ticket/2.6.x/650' into 2.6.xNick Lewis2011-06-073-0/+32
| | |\ \ \
| | | * | | (#650) Allow symlinks for configuration directoriesNick Lewis2011-06-073-0/+32
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, pointing a setting like 'confdir' at a symlink to a directory would replace the symlink with a directory. This was because files created by settings implicitly managed links, rather than following them. This behavior is now changed so that file settings will follow links. The behavior of these symlinks is the same as any other file resource. That is, if the target of the symlink doesn't exist, Puppet will consider this an error. Similarly, if the target of the symlink is a file, then the symlink will still be replaced with a directory, rather than replacing its target. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com> Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
| | * | | Fix acceptance tests not managing their mastersNick Lewis2011-06-062-37/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were assuming a master was already started when they were run, which caused order-dependent failures. They will now start their own masters, and use newer helper methods to run master and agent. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| | * | | Merge branch 'ticket/2.6.x/2128' into 2.6.xNick Lewis2011-06-0615-433/+624
| | |\ \ \
| | | * | | (#2128) Add support for setting node name based on a factNick Lewis2011-06-069-3/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the node_name_fact setting, which specifies a fact to use to determine the node name. This allows dynamically determining the node name without having to modify puppet.conf or command line options. Using this setting requires modifying auth.conf to allow nodes to request catalogs not matching their certnames. For example, this would allow any authenticated node to retrieve any catalog: # $confdir/auth.conf path ~ /catalog/.+ allow * The node_name_fact and node_name_value options are mutually exclusive, because it is ambiguous which setting should take precedence. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | (#2128) Get facts before retrieving catalogNick Lewis2011-06-062-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieving a catalog and getting the facts to submit with the catalog request are distinct operations, and should be done separately. This is also to prepare for adding the ability to determine the node name based on a fact, in which case the node name needs to be determined before it is used for either the catalog or the report. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | (#2128) Add the ability to specify a node nameNick Lewis2011-06-0612-16/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting node_name_value may now be used for 'puppet apply' or 'puppet agent' to specify the name for the node. This will not affect the certificate used by the node, and the node will still be authenticated based on its certname. The default value for node_name_value is the certname. This is useful for eg. EC2 nodes whose random hostnames cannot be easily used to classify them. Paired-With: Jacob Helwig
| | | * | | maint: Refactor specs in preparation for making node name more flexibleNick Lewis2011-06-024-413/+393
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | These tests were stubbing when it was unnecessary, so replace much of it with actual objects and files. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| | * | | (#7193) Fix path issues with acceptance tests that call old shell testsMatt Robinson2011-06-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some rearranging of the acceptance test directories caused some ruby tests that referenced old shell tests to lose their relative paths. Paired-with: Dominic Maraglia <dominic@puppetlabs.com>
| | * | | Merge branch ↵Ben Hughes2011-06-032-2/+2
| | |\ \ \ | | | |/ / | | |/| | | | | | | 'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-to-return-a-value' into 2.6.x
| | | * | (#6885) puppet agent fingerprint requires --verbose to return a value.Ben Hughes2011-06-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always output the fingerprint to STDOUT, no matter what loglevel is used, as that's the whole purpose of the comment. Having to specify --verbose in addition to --fingerprint to get the finger is nonsensical. Update the spec test to stub @puppet puts, instead of the Puppet.logging facilities. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
* | | | | Merge branch '2.7.x'Matt Robinson2011-06-067-40/+162
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.x: (#7624) Manually fetch all properties in instances. (#7193) Fix path issues with acceptance tests that call old shell tests (#7632) Make secret_agent application compatible with secret_agent face (#7624) Auditing should not be enabled by default for purged resources. maint: Confine augeas specs to require the augeas feature (#2728) Add diff output for changes made by Augeas provider
| * | | | Merge branch '2.7rc' into 2.7.xMatt Robinson2011-06-065-22/+14
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7rc: (#7624) Manually fetch all properties in instances. (#7193) Fix path issues with acceptance tests that call old shell tests (#7632) Make secret_agent application compatible with secret_agent face (#7624) Auditing should not be enabled by default for purged resources.
| | * | | Merge branch 'bug/2.7rc/7624-resource-purging-causes-audit-messages' into 2.7rcDaniel Pittman2011-06-061-1/+9
| | |\ \ \
| | | * | | (#7624) Manually fetch all properties in instances.Luke Kaines2011-06-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed the `:audit => :all` flag on creation of an instance from a Puppet type, we stopped fetching all the properties. This had flow-on consequences that were visible from the outside; while some places did their own work to ensure that properties were fetched, others didn't. We now open-code the loop that creates and fetches those properties, to ensure that we have the same data without going through the :audit machinery. This resolves the excessive logging, and also eliminates the behavioural change that we introduced in the previous commit. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| | * | | | (#7193) Fix path issues with acceptance tests that call old shell testsMatt Robinson2011-06-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some rearranging of the acceptance test directories caused some ruby tests that referenced old shell tests to lose their relative paths. Paired-with: Dominic Maraglia <dominic@puppetlabs.com>
| | * | | | Merge branch 'ticket/2.7rc/7632-secret_agent_application' into 2.7rcnfagerlund2011-06-062-19/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | (#7632) Make secret_agent application compatible with secret_agent facenfagerlund2011-06-062-19/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `puppet secret_agent` was failing with an error in validate_args (in interface/action.rb), because the application was trying to pass the certname as an argument to the synchronize action. Also, it was trying to submit the report a second time. Reviewing the code with Nick0, we found that the application wasn't inheriting from FaceBase and was duplicating a lot of work, and were able to resolve the issue by basically deleting the whole thing. This patch makes secret_agent behave like the other Faces apps, and makes synchronize the default action of the secret_agent face. We left the `run_mode :agent` line in the application because of bug #7802. Paired-with: Nick Lewis <nick@puppetlabs.com>
| | * | | (#7624) Auditing should not be enabled by default for purged resources.Dan Bode2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Auditing creates logging messages as of 2.6.5 so it should not be enabled by default. - This patch removes the :audit => :all settting from resources created via self.instances (which is used for purging). Please note that we believe this change to be safe, and *should* not result in user-visible behavioural differences when you use the `instances` method on a type, but we can't give you a perfect assurance of that. If you do have code that depends on the current behaviour, and it misbehaves after this patch, please let us know so we can weep ^W find another solution that works for everyone. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com> Reviewed-By: Nigel Kersten <nigel@puppetlabs.com>
| * | | | maint: Confine augeas specs to require the augeas featureNick Lewis2011-06-021-1/+1
| | | | |
| * | | | Merge branch 'ticket/2.7.x/2728-augeas-display-changes' into 2.7.xJosh Cooper2011-06-022-18/+148
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/2728-augeas-display-changes: (#2728) Add diff output for changes made by Augeas provider