summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '2.6.1rc3'Jesse Wolfe2010-08-2719-84/+141
|\ | | | | | | | | | | This synchronizes the 2.7 master branch with 2.6.1RC3 The 2.7 next branch has now diverged from master for the first time, as if contains code that has not reached "release quality" status.
| * Updated CHANGELOG for 2.6.1rc3James Turnbull2010-08-251-0/+18
| |
| * Fix for #4456 -- need to accept some mime-type aliasesMarkus Roberts2010-08-242-4/+10
| | | | | | | | | | | | Rather than just creating a handler for the base mime-type (e.g. "text/yaml") we create some synonyms where appropriate (e.g. "text/x-yaml", "application/yaml", etc.)
| * Fix for #4489 -- apply was using the rest terminusMarkus Roberts2010-08-242-3/+14
| | | | | | | | | | | | | | | | | | | | Basing pervasive low-level behaviour changes on the application name isn't a good idea, but if we're going to do it we need to remember to update the test when we rename the application. I am not certain that this change is globally correct; there may be other related problems that will not be fixed (and may in fact be exacerbated) by this patch.
| * Fix for #4542 -- included classes weren't assigned proper stagesMarkus Roberts2010-08-242-14/+18
| | | | | | | | | | | | This commit unifies the code paths on which classes are added, alters the default stage to respect the stage of the parent if any, and assures that the resource is notified if its stage is assigned (turning an implicit stage into an explicit one).
| * Fix for #4501 -- reports not generated in standaloneMarkus Roberts2010-08-241-5/+10
| | | | | | | | | | | | | | The refactors for 2.6.x stopped "puppet apply" from saving reports; this fix adds report saving back to puppet apply but leaves a number of related issues (code path consolidation, report contents, etc.) unresolved for future patches in the 2.6.x series or more significant refactoring in 2.7.x.
| * Start server before agentBernhard Miklautz2010-08-211-1/+1
| |
| * [#4555] puppet queue tries to call code it hasn't requiredJesse Wolfe2010-08-211-0/+1
| | | | | | | | | | | | | | | | | | puppet queue was trying to call .subscribe on Puppet::Resource::Catalog::Queue, but that object had not been loaded into the ruby interpreter. This bug was partially masked by ruby's confusing constant resolution, which was incorrectly returning the Puppet::Application::Queue class instead of throwing a NameError
| * fix #4528 - treat * as absentPeter Meier2010-08-211-1/+1
| | | | | | | | | | | | | | Internally the cron type is seeing params containing only '*', as absent. However, if a user was setting a parameter explicitely as '*', we weren't munging it to be absent. Hence, we were setting this param over and over again.
| * Fix for #4518 -- classes not getting added to compiler.classesMarkus Roberts2010-08-212-0/+18
| | | | | | | | | | | | | | The responsibility for adding classes to the compiler's classes list (for use in constructing classes.txt) moved around a bit in the 0.25 to 2.6 transition before being dropped in a merge conflict resolution. Ooops. This restores it, and adds tests to prevent regression.
| * [#4545] Remove obsolete 'trac' specsJesse Wolfe2010-08-211-19/+0
| | | | | | | | | | The method that these specs were testing has been removed, causing the specs to fail.
| * Maint. -- Fix test failures broken by previous commitMarkus Roberts2010-08-212-8/+26
| | | | | | | | | | | | | | This basically involved adding a search method to the yaml indirector, which I did by copying the one from ssl_file and fiddling with it until the tests passed. Since the most straight forward way to do this required extending the interface to the path method I added tests for the additional behaviour.
| * Maint. Removing code at the request of the original authorMarkus Roberts2010-08-212-26/+1
| | | | | | | | A contributor has requested that his changes be removed from puppet.
| * [#4298] Puppet apply prints an error if the file to apply doesn't existMatt Robinson2010-08-212-4/+25
| | | | | | | | | | | | | | | | Also warns you it's skipping files if you pass it more than one file to apply. Reviewed-by: Nick Lewis <nick@puppetlabs.com> Signed-off-by: Matt Robinson <matt@puppetlabs.com>
| * Fixed #4527 correctly for 2.6.1James Turnbull2010-08-131-1/+0
| |
| * Updated config.ru example for 2.6.1James Turnbull2010-08-131-1/+1
| |
* | Merge branch 'next'Jesse Wolfe2010-08-12167-1202/+1059
|\ \ | | | | | | | | | This synchronizes the 2.7 master branch with 2.6.1RC2
| * | Merge commit '2.6.1rc2' into nextJesse Wolfe2010-08-12167-1202/+1059
| |\|
| | * Updated for 2.6.1rc2James Turnbull2010-08-121-0/+39
| | |
| | * Further RST to Markdown fixes for types, values, testsJames Turnbull2010-08-1215-185/+132
| | |
| | * Updated all types to Markdown outputJames Turnbull2010-08-1168-445/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated defaults.rb to Markdown Migrated report documentation to Markdown Migrated Naginator doco to Markdown Updated provider documentation to Markdown
| | * Updated reference output to generate valid MarkdownJames Turnbull2010-08-113-15/+9
| | |
| | * Reformatting documentation from RST to MarkDown (#4509)Jes Fraser2010-08-115-64/+64
| | | | | | | | | | | | Signed-off-by: Jes Fraser <jes@gadget.geek.nz>
| | * Rewrote functions documentation to MarkdownJames Turnbull2010-08-1118-119/+114
| | |
| | * Removed legacy Trac codeJames Turnbull2010-08-113-42/+3
| | |
| | * Maint. Passenger fix broke a testMarkus Roberts2010-08-061-3/+3
| | | | | | | | | | | | The content-length fix for passenger broke a test; this fixes it.
| | * Fix for #4476 -- rails calling yaml internalsMarkus Roberts2010-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some recent versions of rails have started calling yaml with the internal (and IIRC depricated) signature; this does nothing special in yaml but it breaks with zaml, so we add an ignored parameter to simulate the non-behavior. *sigh* I love rails.
| | * Fixes #4485 -- single quoted strings should not treat \n as new lineMarkus Roberts2010-08-052-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the rest of the change for #4303; James and I discussed various ways the solution to that ticket needed to be extended but, as neither of us committed code, nothing changed. This is the least implact extension, which mimics the behaviour of prior versions. It leaves open the question: should '\\x' start with a single or double backslash? If, as now, '\\x' starts with a double backslash (i.e. single quote is the only escapable characterin single quoted strings) a string ending in a backslash can not be represented in a single quoted string.
| | * Passenger needs HTTP headers values to be stringBrice Figureau2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When streaming a file through rack, we set the Content-Length header to be the size of the transmitted file. This size is an int, and recent passenger versions only support string values. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| | * [#4404] Remove requirement for source on Parser::Resource::ParamNick Lewis2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stage[main] is created without an associated source, to which Parser::Resource::Param objects. This patch observes that the source attribute of both Parser::Resource and Parser::Resource::Param seem not to be used anywhere, and removes the requirement that it be supplied.
| | * [#4364] Fix failing spec due to incorrect loglevelJesse Wolfe2010-08-041-1/+1
| | | | | | | | | | | | | | | A spec was failing since it wasn't updated when the #4364 change was made.
| | * Fix #4458 - Do not dump the whole environment when instances can't be foundBrice Figureau2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating the error message when we can't find any instances for a search request, we were "inspect"ing the request which now contains an environment instance which itself contains a lots of things (including all the known resource types). Thus it was generating a very large "reason" (ie the HTTP error string). On some environments (ie proxied mongrel) this was too large and the proxy would produce an error 500. I just changed the error message to just log the indirection name and request key (which should be enough to understand what is wrong). Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| | * Fix for #4465 -- earlier "feature" patch broke ldapMarkus Roberts2010-08-042-69/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The patch for #3904 should not have been accepted; it's buggy and the use case (supporting having nodes in ldap more than once with the same name but distinct records) is ill-conceived. This commit reverts the patch (a7884b47) and the previous attempt to fix it (e6709da4), restoring the old (0.25.x) behaviour.
| | * Maint -- tests need to respect RFC-952Markus Roberts2010-08-041-1/+2
| | | | | | | | | | | | | | | | | | We had a test that assumed hostnames would only consist of letters; by RFC-952 they are also allowed to contain digits and '-'s. The test failed on such machines.
| | * [#4467] Make Puppet Master respect facts_terminus settingsRein Henrichs2010-08-044-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove hard-coded facts terminus in master * Change facts_terminus default to 'yaml' for master and 'facter' for everything else. Paired-with: Matt Robinson <matt@puppetlabs.com> Signed-off-by: Rein Henrichs <rein@puppetlabs.com>
| | * added md5 support as requested in ↵Alice Kærast2010-08-031-0/+5
| | | | | | | | | | | | http://serverfault.com/questions/166199/puppet-md5-sum-of-string
| | * [#4381] extlookup shouldn't trigger reparses of .pp filesJesse Wolfe2010-08-031-3/+0
| | | | | | | | | | | | | | | | | | | | | extlookup was adding its data files to the list of watched source files. This causes the .pp manifests to be re-parsed whenever the .csv files change, which is no longer necessary, as the .csv files are already reparsed on every function call.
| | * [#4370] Fixes extlookup precedence getting overwritten between runsMatt Robinson2010-08-035-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We found the gsub! in extlookup was actually modifying the value for extlookup_precedence, so the next node to call it just got the interpolated value from the first run. We did two things in the code to prevent this: 1. We returned a dup of the ast string object so that modifying it wouldn’t change puppet’s state. We didn’t do this for all possible return values because we depend on using the original ast array object to do array concatenation 2. We fixed extlookup to not do a destructive gsub Reviewed by: Jesse Wolfe
| | * Fixed #4364 - Reduced audit msg from info to debugJames Turnbull2010-08-031-1/+1
| | |
| | * [#4347] run_mode was colliding with --mode for "puppet doc"Jesse Wolfe2010-08-032-2/+2
| | | | | | | | | | | | | | | | | | The run_mode value was incorrectly getting stored to Puppet[:mode], which was confusing the optparser for applications that declare a --mode parameter.
| | * [#4423] repair parameterized class instantiationJesse Wolfe2010-08-034-17/+32
| | | | | | | | | | | | | | | | | | My earlier #4397 patch was not aware of the parameterized class instantiation syntax, and failed on manifests that instantiate parameterized classes.
| | * [#4423] class { shouldn't get stored on the namespace stackJesse Wolfe2010-08-032-1/+7
| | | | | | | | | | | | | | | | | | | | | The new syntax for instantiating parameterized classes was confusing the lexer's notion of namespaces. This is a simple fix to prevent that syntax from polluting the namespaces.
| | * [#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the ↵Jesse Wolfe2010-08-0317-185/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AST resources. Move type-name resolution out of Puppet::Resource into the AST resources. Move find_resource_type out of Puppet::Resource into Scope Thus, never pass unqualified type names to Puppet::Resource objects. Thus, Puppet::Resource objects don't need the namespace property, and Puppet::Resource objects never consult the harddrive to look for .pp files that might contain their type definitions, Thus, performance is improved. Also removes the temporary fix for #4257 that caused #4397 (The code was too eager to look for a class in the topscope) Paired-With: Paul Berry <paul@puppetlabs.com> Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
| | * [#4344] Temporary fix to stop agent from importing modulesNick Lewis2010-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | Due to type collection madness, agent tries to import modules to resolve resource types. That is wrong, decreases performance, and causes problems. This patch forces agent to not import any files by setting ignoreimport to true.
| | * [#4344] Fix for failing templates when module name matches file in local dir.Paul Berry2010-08-035-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the name of a module matches the name of a file in the local directory, puppet agent would sometimes try to read that file and interpret it as puppet code. This happened because files.rb was unintentionally permitting puppet files without an extension. Fixed by changing the glob pattern to only permit ".pp" and ".rb" extensions.
| | * [#4336] "reportdir" was in the wrong sectionJesse Wolfe2010-08-031-10/+10
| | | | | | | | | | | | | | | | | | | | | Correctly revert damage done by c00285c, which incorrectly reverted in a7e4fe8. The result was that "puppet agent" and others were trying to create a reportdir that they don't actually use.
| | * Fixed #4311 - Typo in defaults.rbJames Turnbull2010-08-031-1/+1
| | |
| | * Fix #4461 - attempt to fix another performance issueBrice Figureau2010-08-033-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a profiling of a 2.6.1rc1 puppet master, I found that we spend a lot of time and efforts in Puppet::Util::Autoload#module_directories. Since this method is doing a bunch of filesystem access, this process is slow. In fact each time we were evaluating a resource or trying to find if a given resource was a builtin type we ended up scanning the whole module directories for the given environment. This patch attempts to fix this performance issue by caching the module_directories output for the either the time of the compilation or an agent configurer run (since this stuff looks like to be shared for both compilation and catalog evaluation). With this patch, my compilation time for 2k resources went from 5.91s to 3.71s (second run each time to allievate parsing time).. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com> Edited to fix a typo [#4434] Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
| | * Fix for #4300 Solaris svc files need new pid filenamesmarkus2010-08-032-2/+2
| | | | | | | | | | | | | | | | | | The conf/solaris/smf/svc-puppetd and svc-puppetmasterd still used puppetd.pid and puppetmasterd.pid for stopping the services in 2.6.0. These are changed to agent.pid and master.pid for 2.6.1.
| | * [#4284] Fix failing specs run as root due to missing puppet groupNick Lewis2010-08-0311-0/+11
| | | | | | | | | | | | | | | | | | | | | These specs 'use' some settings which create directories belonging to the 'service' user/group. If the default service group doesn't exist, these fail. This patch explicitly sets the service group to the gid of the process, which is known to be accessible by the user.