summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'maint/2.6.x/fix_plaform_detection' into 2.6.xDominic Maraglia2011-07-122-3/+2
| | |\ \ \ \ \
| | | * | | | | (maint) Fix platform dection for RHELDominic Maraglia2011-07-122-3/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detecting supported platform used incorrect string for RHEL. Changed string from 'redhat' to 'rhel'
| * | | | | | Merge branch 'ticket/2.7.x/maint-fix_doc_link' into 2.7.xMatt Robinson2011-07-141-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * ticket/2.7.x/maint-fix_doc_link: maint: Fix documentation link for fileserver configuration
| | * | | | | maint: Fix documentation link for fileserver configurationMatt Robinson2011-07-141-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link to the filesever configuration page linked to the wiki, which links back to the docs site. Short circuiting that do just link to where you want to go. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.7.x/4142-metadata_json' into 2.7.xMatt Robinson2011-07-122-10/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/4142-metadata_json: (#4142) Fix module check not to fail when empty metadata.json
| | * | | | | (#4142) Fix module check not to fail when empty metadata.jsonMatt Robinson2011-07-122-10/+42
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the puppet module tool was fixed to generate the required metadata attributes when it packages modules, it still creates an empty metadata.json file that gets checked into everybody's module repos. This causes the module to be unusable straight from a git clone since puppet was requiring all the required metadata attributes just with the presence of that file, and resulting in the error: No source module metadata provided for mcollective at This change makes it so that if you have an empty metadata.json (like the moduletool generates), puppet doesn't consider it to have metadata. If you have ANY metadata attributes in that file, it will still check to make sure all the required attributes are present. The work around up to this point has just been to delete the metadata.json file in git cloned modules. This also fixed the tests around this to actually run, since previously the tests depended on the a json feature, which we didn't have. We do, however, have a pson feature. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | | | Revert "Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into ↵Jeff McCune2011-07-104-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.7.x" This reverts commit b7ee0258ab40478329c20177eda9b250f27ede18, reversing changes made to 8fe2e555ac3d57f5b6503ffe1a5466db8d6e190a.
| * | | | | Merge branch 'ticket/2.7.x/7699_fix_help_listing_options_twice' into 2.7.xJeff McCune2011-07-104-2/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/7699_fix_help_listing_options_twice: (#7699) - Help should only show options once
| | * | | | | (#7699) - Help should only show options onceDan Bode2011-07-104-2/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | puppet help was reprinting every option once for every alias that is had. This fix involves only storing the option.name in the @options instance var for both face and actions options. The @options_hash still maintains the list of options and aliases as its keys. Reviewed-by: Daniel Pittman (puppet-dev list)
| * | | | | Merge branch 'ticket/2.7.x/8032_create_resource_containment' into 2.7.xJeff McCune2011-07-101-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.7.x/8032_create_resource_containment: (#8032) Add containment to create_resources
| | * | | | | (#8032) Add containment to create_resourcesJeff McCune2011-07-101-5/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change native resource types declared using the create_resources() function are not contained within the class scope of the function call. As a result, resources were "floating off" in the graph, disconnected from the rest of the relationship edges. With this change, the scope is preserved and native resources are contained by the class the function call is executed from. Reviewed-by: Dan Bode <dan@puppetlabs.com>
| * | | | | Merge branch 'ticket/2.7.x/8147' into 2.7.xnfagerlund2011-06-292-2/+2
| |\ \ \ \ \
| | * | | | | (#8147) Update test for default reporturlnfagerlund2011-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit test to accomodate the default URL change made in commit f6882d6d5779883e931a6f558c06f631098011c5. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | * | | | | (#8147) Change default reporturl to match newer Dashboard versionsnfagerlund2011-06-291-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet's default reporturl setting was http://localhost:3000/reports, which has been deprecated in Puppet Dashboard in favor of http://localhost:3000/reports/upload. As Dashboard is the first-class destination for the http report processor, this commit changes Puppet's default to match what current versions of Dashboard expect. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
* | | | | | 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>
* | | | | Updating CHANGELOG for 2.7.2rc3Michael Stahnke2011-07-291-0/+4
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
* | | | Updated CHANGELOG for 2.7.2rc2Michael Stahnke2011-07-251-0/+5
| | | |
* | | | Merge branch 'ticket/master/8301-redhat-spec-cleanup' into 2.7rcJacob Helwig2011-07-141-7/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/master/8301-redhat-spec-cleanup: (#8301) Red Hat spec file for 2.7.2rc1 won't work
| * | | | (#8301) Red Hat spec file for 2.7.2rc1 won't workMichael Stahnke2011-07-141-7/+40
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Red Hat spec file included in ext. Now reduces the number of rpmlint complaints. Fixed license tag to be compliant with Fedora guidelines. Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
* | | | (#5108) Update service type docs for new hasstatus defaultnfagerlund2011-07-141-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit #7d35a479 changed the default value of the service type's hasstatus attribute. This was never documented. This commit documents the changed behavior, which will end up in the type references (and puppet describe) for version 2.7.2 and greater. (I intend to manually change the cached references for versions 2.7.[01].)
* | | | Updated CHANGELOG and package building files for 2.7.2rc1Michael Stahnke2011-07-065-6/+132
| | | | | | | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
* | | | Merge branch 'master' into 2.7rcMichael Stahnke2011-07-065-0/+409
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '2.7.x'Jacob Helwig2011-06-281-2/+2
| |\ \ \ | |/ / / |/| | | | | | | | | | | * 2.7.x: Update configurer_spec.rb to work with Ruby 1.8.5
* | | | Update configurer_spec.rb to work with Ruby 1.8.5Jacob Helwig2011-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 1.8.5 doesn't have start_with? on String, so instead of checking the log message using start_with? we check using a regex. Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| * | | Merge branch '2.7.x'Jacob Helwig2011-06-2857-388/+779
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.x: (23 commits) Clean up indentation, whitespace, and commented out code Remove order dependency from functions integration spec (#7956) Porting cron tests (#7956) Port resource acceptance tests (#8048) Gem install puppet no longer fails if rdoc enabled. Updating for 2.7.1 release. (#8048) Gem install puppet no longer fails if rdoc enabled. Readying for release of 2.6.9 Updating CHANGELOG for 2.7.0 (#6854) Update Red Hat spec file Bumping release in lib/puppet.rb and updating CHANGELOG. Bumping RPM spec file to 2.6.9rc1. (#7224) Reword 'hostname was not match' error message (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names (#7506) Organize READMEs; specify supported Ruby versions in README.md (#7506) Specify supported Ruby versions in README.md (#5641) Help text: document that puppet doc takes modulepath, manifestdir, and environment options (#6418) Make test 64118 more portable (#7127) Stop puppet if a prerun command fails Do not needlessly create multiple reports when creating a transaction ...
* | | | Merge branch '2.6.x' into 2.7.xJacob Helwig2011-06-2846-317/+587
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6.x: (#7956) Porting cron tests (#7956) Port resource acceptance tests Readying for release of 2.6.9 (#6854) Update Red Hat spec file Bumping release in lib/puppet.rb and updating CHANGELOG. Bumping RPM spec file to 2.6.9rc1. (#7506) Organize READMEs; specify supported Ruby versions in README.md (#6418) Make test 64118 more portable (#7127) Stop puppet if a prerun command fails Do not needlessly create multiple reports when creating a transaction (#4416) Ensure types are providified after reloading (#4416) Always remove old provider before recreating it Cleanup indentation, comment, and unused code Conflicts: CHANGELOG README.md conf/redhat/puppet.spec lib/puppet.rb lib/puppet/transaction.rb spec/unit/configurer_spec.rb spec/unit/transaction_spec.rb
| * | | Merge branch '2.6rc' into 2.6.xJacob Helwig2011-06-282-30/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 2.6rc: Readying for release of 2.6.9
| | * | | Readying for release of 2.6.9Michael Stahnke2011-06-212-30/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| * | | | Merge branch 'ticket/2.6.x/7956' into 2.6.xDominic Maraglia2011-06-275-30/+15
| |\ \ \ \
| | * | | | (#7956) Porting cron testsDominic Maraglia2011-06-275-30/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported cron tests were still weak. Coverted tests to use Ruby asserts for better debugging of subsequent failures. Add stronger regex's to look for expected output when applying puppet resource manifests.
| * | | | Merge branch 'maint/2.6.x/add_ported_resources_tests_from_enterpise_dist' ↵Dominic Maraglia2011-06-2729-96/+119
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 2.6.x
| | * | | | (#7956) Port resource acceptance testsDominic Maraglia2011-06-2729-96/+119
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Many of the Puppet resource acceptance tests were RHEL/Centos specifc. These tests were ported under the enterptise-dist repo; move the tests into 2.6.x for merging.
| * | | | Merge branch '2.6rc' into 2.6.xMichael Stahnke2011-06-151-23/+88
| |\| | |
| | * | | Merge branch 'tickets/2.6rc/6854' of git://jet.mox.net/~tmz/puppet into 2.6rcMichael Stahnke2011-06-151-23/+88
| |/| | |
| | * | | (#6854) Update Red Hat spec fileTodd Zullinger2011-06-151-23/+88
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync the spec file with Fedora/EPEL and pull in the following changes: - Ensure %%pre exits cleanly - Fix License tag, puppet is now GPLv2 only - Properly restart puppet agent/master daemons on upgrades from 0.25.x - Require libselinux-utils when selinux support is enabled - Support tmpfiles.d for Fedora >= 15 (#656677)
| * | | Bumping release in lib/puppet.rb and updating CHANGELOG.Michael Stahnke2011-06-142-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | This is for release 2.6.9rc1. Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| * | | Bumping RPM spec file to 2.6.9rc1.stahnma2011-06-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I will bump the RPM spec file for each release, that way as soon as we cut a release candidate, we won't get a patch that updates the spec. Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| * | | Merge branch '2.6.x' into 2.6rcstahnma2011-06-143-44/+31
| |\ \ \
| | * \ \ Merge branch 'ticket/2.6.x/7506' into 2.6.xnfagerlund2011-06-142-41/+17
| | |\ \ \
| | | * | | (#7506) Organize READMEs; specify supported Ruby versions in README.mdnfagerlund2011-06-142-41/+17
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The README was not specific enough about the current state of our Ruby support. This commit lays out our current status as discussed in issue #7506 and in greater detail on the internal mailing list around April 8, 2011 under the subject "Statler Ruby Versions Support." This commit also consolidates two redundant README files into one. Paired-With: Matt Robinson <matt@puppetlabs.com>
| | * | | Merge branch 'ticket/2.6.x/6418' into 2.6.xDominic Maraglia2011-06-101-3/+14
| |/| | |
| | * | | (#6418) Make test 64118 more portableDominic Maraglia2011-06-101-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test used a bash command negation to negate the a grep: '! grep ensure.*directory /var/opt/lib/pe-puppet/state/state.yaml' which only works on newer bash shells only. Removed the shell negation and use the harnesses ":acceptable_exit_codes" parameter.
| * | | | Merge branch 'ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet' ↵Josh Cooper2011-06-108-131/+210
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into 2.6.x * ticket/2.6.x/7127-prerun-command-failures-dont-stop-puppet: (#7127) Stop puppet if a prerun command fails Do not needlessly create multiple reports when creating a transaction
| | * | | (#7127) Stop puppet if a prerun command failsJosh Cooper2011-06-107-121/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change there were several problems with pre and post run commands, logging, and sending of reports. 1. If a prerun command failed, puppet would attempt to apply the catalog. Now puppet will not apply the catalog, but it will run the postrun command and send the report (as it did before). 2. If a postrun command failed, puppet would not send the report. Sending the report is now in an outer ensure block from the postrun command, so postrun failures won't prevent the report from being sent. 3. Errors, e.g. Puppet.err, occuring during the prepare step, which which includes plugin/fact download and prerun commands were not appended to the report. Now the report log destination is registered as early as possible, and unregistered as late as possible to ensure Configurer errors that occur in the run method are included in the report. 4. The transaction was closing the Configurer's report destination out from underneath it. As a result, postrun errors were not included in the report. Paired-with: Nick Lewis <nick@puppetlabs.com> Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
| | * | | Do not needlessly create multiple reports when creating a transactionJosh Cooper2011-06-103-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the transaction would always create a report, which would some times be overridden with a new report. Now, the transaction optionally takes a report at initialization time, and only creates a report of its own if none was provided. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
| * | | | Merge branch 'ticket/2.6.x/4416' into 2.6.xNick Lewis2011-06-104-44/+97
| |\| | |
| | * | | (#4416) Ensure types are providified after reloadingNick Lewis2011-06-102-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the 'provider' parameter for a type was only added when creating a provider for that type. This would cause a type to forget about its 'provider' parameter when only the type was reloaded. This was manifesting itself in pluginsync, when a provider plugin would be loaded before its type, causing the type to be autoloaded. The type plugin would then be loaded again by the plugin handler. Because the type => provider information is stored separately from the type, the providers don't need to be reloaded, and thus don't recreate the type's 'provider' parameter. Now we always "providify" the type (add its 'provider' parameter) upon creation, after trying to load its providers, if any providers are present. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| | * | | (#4416) Always remove old provider before recreating itNick Lewis2011-06-102-14/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where provider class evaluation failed midway, the provider class would be created but not registered. Thus, when checking whether it should be removed, it wasn't found, and wasn't removed. This caused it to then fail to be recreated, because it collided with the existing class. Now we don't bother checking whether the provider is registered before we remove it, since rmclass has the appropriate checks to do the unregistration, and class removal safely. Removing a provider class that has been created but not registered should not be a problem since the only time this can happen is when the class is unusable because of parsing or other fatal errors in the provider itself. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| | * | | Cleanup indentation, comment, and unused codeNick Lewis2011-06-102-30/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Great Reindentation of '10 left certain structures indented incorrectly; this addresses some of these instances. The comment about loading all providers incorrectly stated that we're trying to figure out the type, when we're actually trying to figure out the provider. There was an unused variable initialization that was introduced in 2b14f627, which was reverting c19835c, 9290cc8, and ffb4c2d. Paired-with: Jacob Helwig <jacob@puppetlabs.com>