summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Switching to use of json matchersLuke Kanies2011-07-152-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only in the Node and Indirection::Request code. It makes the tests much simpler. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| | * | | | | Making Fact json handling more resilientLuke Kanies2011-07-152-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were failing if any values were nil, and values were often nil, at least in testing. We now only include non-nil values, and we handle nil values just fine. Signed-off-by: Luke Kanies <luke@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com>
| | * | | | | Adding json support to Puppet::NodeLuke Kanies2011-07-152-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Pittman <daniel@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com> Signed-off-by: Luke Kanies <luke@puppetlabs.com>
| | * | | | | (7080) Adding json support to Indirector RequestLuke Kanies2011-07-152-2/+148
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll be using this to do RPC over mcollective. Reviewed-by: Daniel Pittman <daniel@puppetlabs.com> Reviewed-by: Nick Lewis <nick@puppetlabs.com> Signed-off-by: Luke Kanies <luke@puppetlabs.com>
| * | | | | Merge branch 'ticket/master/8356-color-setting-on-windows'Jacob Helwig2011-07-131-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/master/8356-color-setting-on-windows: (#8356) Specify setting type for color
| | * | | | | (#8356) Specify setting type for colorJacob Helwig2011-07-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we default the color setting to "false" on Microsoft Windows, the heuristics used to detect which type of setting we're using were getting confused, and mis-detected color as being a BooleanSetting rather than just a Setting. By specifying that color is a "Setting", we can skip the auto-detection, and avoid this problem entirely. Reviewed-by: Josh Cooper <josh@puppetlabs.com>
| * | | | | | Merge branch 'feature/master/8268-puppet-agent-windows'Josh Cooper2011-07-121-5/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * feature/master/8268-puppet-agent-windows: (#8268) Fix resource harness spec tests
| | * | | | | (#8268) Fix resource harness spec testsJosh Cooper2011-07-121-5/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The windows file type requires that the path start with either a drive letter or UNC style path. Also Ruby's File implementation on windows only supports 0644 and 0444 permission bits (it doesn't differentiate between group and other, and it doesn't know about the execute bit). This commit maps the path and permissions used in the test to sensible values when running on windows. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| * | | | | Merge branch 'ticket/master/8356-default-color-should-be-false-on-windows'Josh Cooper2011-07-112-1/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/master/8356-default-color-should-be-false-on-windows: (#8356) Color defaults to false on Windows
| | * | | | | (#8356) Color defaults to false on WindowsJosh Cooper2011-07-112-1/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows consoles do not support ansi escape sequences for colorizing output. This commit changes the default setting of 'color' to false when the "microsoft_windows" feature is present. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
| * | | | | Merge pull request #15 from ↵Jeff McCune2011-07-091-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeffmccune/ticket/master/8032_create_resources_containment (#8032) Add containment to create_resources
| | * | | | | (#8032) Add containment to create_resourcesJeff McCune2011-06-211-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 'disable-master-on-windows'Jacob Helwig2011-07-082-1/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disable-master-on-windows: Disable the master on Windows instead of blowing up with failed resources
| | * | | | | | Disable the master on Windows instead of blowing up with failed resourcesJacob Helwig2011-07-082-1/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running the Puppet master on Windows is not supported, so instead of failing with what can be cryptic error messages about failed resources we fail with an explicit error message about the master on Windows not being supported. This way a user isn't mistakenly given the impression that running a master on Windows will work, and they just have something mis-configured. Signed-off-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Max Martin <max@puppetlabs.com>
| * | | | | | Merge branch 'ticket/master/7581-windows-feature-detection-error-message'Jacob Helwig2011-07-081-1/+9
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | * ticket/master/7581-windows-feature-detection-error-message: (#7581) Provide more detailed error message when missing gems on Windows
| | * | | | | (#7581) Provide more detailed error message when missing gems on WindowsJacob Helwig2011-07-081-1/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running Puppet on Windows requires the sys-admin, win32-process & win32-dir gems. If any of these gems were missing, Puppet would fail with the message "Cannot determine basic system flavour". When trying to determine if we are on Windows, we now warn with the message "Cannot run on Microsoft Windows without the sys-admin, win32-process & win32-dir gems: #{err}", where err is the normal ruby load error message stating which gem could not be loaded. We also only warn if the POSIX feature is not present. Signed-off-by: James Turnbull <james@puppetlabs.com> Signed-off-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Cameron Thomas <cameron@puppetlabs.com>
| * | | | | 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
| | |/| | |
| | * | | | 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 'template-not-defined-test-failure-2.7.x' into 2.7.xJacob Helwig2011-06-282-7/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * template-not-defined-test-failure-2.7.x: Clean up indentation, whitespace, and commented out code Remove order dependency from functions integration spec
| | * | | | | | Clean up indentation, whitespace, and commented out codeJacob Helwig2011-06-281-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mis-indented code, extra newlines, and commented out code were noticed while investigating the order dependent test failure fixed in 4365c8ba. Reviewed-by: Max Martin <max@puppetlabs.com>
| | * | | | | | Remove order dependency from functions integration specJacob Helwig2011-06-281-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test in spec/integration/parser/functions_spec.rb would fail when the spec tests were run in the order (among other orderings): spec/unit/parser/functions/tag_spec.rb spec/unit/parser/templatewrapper_spec.rb spec/integration/parser/functions_spec.rb There are tests that would cause the "template" function to be loaded into the root environment. Puppet::Parser::Functions.function("template") would then detect its presence and P::P::F.rmfunction("template") would fail since #function(...) looks in more than just the current environment to see if a function is defined, while #rmfunction(...) only looks in the current environment to see if a function can be removed. In the test ordering specified earlier, tag_spec.rb would load the "template" function, and templatewrapper_spec.rb would create a current environment that would mask the root environment for #rmfunction(...), but not for #function(...) Since #rmfunction(...) only looks in the current environment, we should be using #functions.include?("template") since that matches the check that #rmfunction(...) itself uses. Paired-with: Nick Lewis <nick@puppetlabs.com>
| * | | | | | (#8048) Gem install puppet no longer fails if rdoc enabled.Josh Cooper2011-06-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-released versions of faces may have used the "desc" option, which was later changed to "description", and an alias provided for "desc". The previous fix for 8048 removed this backwards compatibility (since it was never released to customers). This commit fixes the test case that assumed the "desc" option was still available. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| * | | | | | Merging up 2.7.1Michael Stahnke2011-06-224-50/+47
| |\ \ \ \ \ \
| | * | | | | | Updating for 2.7.1 release.Michael Stahnke2011-06-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| | * | | | | | (#8048) Gem install puppet no longer fails if rdoc enabled.Michael Stahnke2011-06-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rdoc wouldn't parse lib/puppet/interface/options.rb The offending code has been removed. This was causing issues for users wishing to upgrade puppet, via gem or puppet. Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
| | * | | | | | Updating CHANGELOG for 2.7.0Michael Stahnke2011-06-161-40/+34
| | | | | | | |
| | * | | | | | (#7506) Specify supported Ruby versions in README.mdnfagerlund2011-06-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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." Paired-With: Matt Robinson <matt@puppetlabs.com>
| * | | | | | | Merge branch 'ticket/2.7.x/7224' into 2.7.xNick Lewis2011-06-147-14/+128
| |\ \ \ \ \ \ \