summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix #5127 - error when accessing array elementsBrice Figureau2010-11-102-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accesing an array with an integer index (ie $array[1]) is producing a ruby error: can't convert String into Integer This is because the array index is not properly converted to an number before the array element lookup is performed. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | (#5242) Fix schedule specs that fail near daylight savingsMatt Robinson2010-11-101-43/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I fixed a few of these in a previous patch, but Hudson found more. I replaced the pattern of using Time.now and then doing date math to calculate intervals with the pattern of hard setting the intervals using utc times for the test. Reviewed-by: Paul Berry <paul@puppetlabs.com>
| * | | | Kludge for #5206 -- port of fix for #3536 to yamlMarkus Roberts2010-11-102-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal format of parameters was changed between 0.25.x and 2.6.x, making them incompatible when serialized. This was fixed for PSON under ticket #3656 (by modifying the data as it was serialized) in: commit f66095d35bc5f9645eb19bbb8cefa342c0181d2d and commit 2edf7fe968ac3d8af9865f65100940747c1fa894 but nothing was done about the other serialization formats. This commit adds a callback to zaml property serialization and uses it to route data through the fixup method added in the commits above, thus fixing the problem "the same way" as it was fixed for PSON under #3656. It does nothing about marshal, mostly because I have not totaly gone over to the dark side (yet).
| * | | | (#5062) Add envpuppet helper script to ext/Jeff McCune2010-11-101-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script helps people quickly test different branches of various puppet related projects like facter, puppet-scaffold, puppet-dashboard, etc... It allows the user to simply clone puppet and start running different puppet version without installing puppet or any other setup costs.
| * | | | [#5225] Fix spec failure that depended on time changeMatt Robinson2010-11-081-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that: zero = Time.now # Reset the current time to X:00:00 current = zero - (zero.hour * 3600) - (zero.min * 60) - zero.sec current is actually 1am on a day where the time falls back (Nov 7th), not midnight as the test expected. Reviewed-by: Paul Berry <paul@puppetlabs.com>
| * | | | (#5233) Randomize tmp dir pathsMatt Robinson2010-11-085-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize how we create tmpdirs by using the puppet function instead of Dir.tmpdir. Paired-with: Paul Berry <paul@puppetlabs.com>
* | | | | Merge branch 'next' of git://github.com/puppetlabs/puppet into nextMarkus Roberts2010-11-171-77/+57
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ticket/next/5079' into nextMatt Robinson2010-11-161-77/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/5079: (#5079) Refactor and cleanup mcxcontent provider (#5079) Move methods around to make it clearer whether they're public or private
| | * | | | | (#5079) Refactor and cleanup mcxcontent providerMatt Robinson2010-11-161-40/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a rework for diff clarity of a patch submitted by Sandor Szuecs <sandor.szuecs@fu-berlin.de> Reviewed-by: Paul Berry <paul@puppetlabs.com>
| | * | | | | (#5079) Move methods around to make it clearer whether they're public or privateMatt Robinson2010-11-161-51/+48
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One method was showing up as a private class method, which turns out isn't possible, so it got moved into the public section. This is a rework for diff clarity of a patch submitted by Sandor Szuecs <sandor.szuecs@fu-berlin.de> Reviewed-by: Paul Berry <paul@puppetlabs.com>
* | | | | | Merge branch 'ticket/next/4590' into nextMarkus Roberts2010-11-176-232/+481
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/puppet/util/monkey_patches.rb -- two unrelated additions had been made, kept them both.
| * | | | | [#4590] SimpleGraph is slowPaul Berry2010-10-076-232/+479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote SimpleGraph to use a more efficient internal representation. To preserve compatibility with older clients, graphs are still serialized to YAML using the format used by Puppet 2.6. However, a newer, more compact format can be enabled by setting "use_new_yaml_format" to true. Deserialization from YAML accepts either the old 2.6 format or the newer format. In a later release, once we no longer need to be compatible with 2.6, we will be able to switch to the new format. To make deserialization accept multiple formats, it was necessary to use the yaml_initialize method. This method is not supported in versions of Ruby prior to 1.8.3, so a monkey patch is included to add support for it to Ruby 1.8.1 and 1.8.2. Thanks to Markus Roberts for the SimpleGraph rewrite. Thanks to Jesse Wolfe for figuring out how to write the yaml_initialize monkey patch.
* | | | | | Merge branch 'feature/next/3747' into nextNick Lewis2010-11-112-0/+123
|\ \ \ \ \ \
| * | | | | | (#3747) Add specs for upstart providerNick Lewis2010-11-112-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired-With: Matt Robinson
| * | | | | | (#3747) Implement upstart providerNan Liu2010-11-111-0/+76
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ticket/next/4904' into nextJesse Wolfe2010-11-112-6/+28
|\ \ \ \ \ \
| * | | | | | Fix #4904 Mounts shouldn't remount unless they are ensure=>mountedJesse Wolfe2010-11-112-6/+28
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After we fixed issue #2730, it is now possible to manage an fstab entry without asking puppet to try to call mount or unmount on that device. That fix failed to address the "refresh" behavior of mounts. We have changed "refresh" to only remount devices that are set to "mounted", so users can truly manage fstab entries without having puppet try to remount them. Paired-With: Paul Berry <paul@puppetlabs.com>
* | | | | | Merge branch 'maint/next/clean_up_local_branch_in_mail_patches' into nextPaul Berry2010-11-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Maint: Move "Local-branch:" info below "---"Paul Berry2010-11-111-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running "rake mail_patches", moved the "Local-branch:" info lines below the "---" line in the e-mail, so that if someone applies the patch using "git am", the "Local-branch" notation won't show up in the commit message.
* | | | | Merge remote branch 'masterzen/tickets/2.6.x/5023' into nextPaul Berry2010-11-091-26/+62
|\ \ \ \ \
| * | | | | Puppet-load: better and safer error reportingBrice Figureau2010-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of connection, dns or timeout error, puppet-load would not report the error correctly or could crash. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| * | | | | Fix #5023 - puppet-load multiple nodes supportBrice Figureau2010-10-171-25/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows puppet-load to compile multiple nodes catalog. This is done by using multiple --node. Puppet-load will use round-robin to chose which nodes catalog to ask for a given simulated client. It is also possible to pass a directory of facts yaml file in which puppet-load will load given --node facts file. This can work only if #5020 is applied to the puppetmaster first. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
* | | | | | Merge branch 'feature/master/5198' into nextPaul Berry2010-11-092-5/+8
|\ \ \ \ \ \
| * | | | | | (#5198) Added a spec test for new TB unitPaul Berry2010-11-091-1/+2
| | | | | | |
| * | | | | | (#5198) add terabyte support to tidy type's size parameterGarrett Honeycutt2010-11-031-3/+4
| | | | | | |
| * | | | | | (#5198) add gigabyte reference to docs for tidy type's size parameterGarrett Honeycutt2010-11-031-3/+4
| | | | | | |
* | | | | | | Merge remote branch 'jamtur01/tickets/2.6.x/5108' into nextPaul Berry2010-11-092-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed to #5108 - Change default of service hasstatus property to trueJames Turnbull2010-10-272-0/+6
| | | | | | | |
* | | | | | | | Merge remote branch 'jeffmccune/ticket/2.6.x/5062' into nextPaul Berry2010-11-091-0/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | (#5062) Add envpuppet helper script to ext/Jeff McCune2010-10-251-0/+80
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script helps people quickly test different branches of various puppet related projects like facter, puppet-scaffold, puppet-dashboard, etc... It allows the user to simply clone puppet and start running different puppet version without installing puppet or any other setup costs.
* | | | | | | | Merge commit '2.6.3rc2' into nextPaul Berry2010-11-0912-139/+210
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '2.6.3rc2' into nextPaul Berry2010-11-0912-139/+210
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually resolved conflicts: lib/puppet/parser/ast/resource.rb spec/unit/parser/ast/resource_spec.rb
| | * | | | | | | Updated CHANGELOG for 2.6.3rc2James Turnbull2010-10-291-0/+9
| | | | | | | | |
| | * | | | | | | Fixed #5112 - Launchd Service broke in 2.6.2 with OS X 10.4 Clients.donavan2010-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just to follow up on 5112 I have a dirty patch that appears to work. Nominally tested it on 10.4, 10.5, & 10.6. 10.4 now applies catalogs instead of failing. All versions successfully manage a test services state as well. Does anyone have a better suggestion than '-o /dev/stdout'? Seems a mite hacky to me. Also I think that the 10.4 machines are going to a have a \ ( slash ) file in whatever puppets working dir was. plutil seems to have been interpreting as literal file name.
| | * | | | | | | Fixed #5137 - Removed no longer required TOC referencesJames Turnbull2010-10-291-2/+0
| | | | | | | | |
| | * | | | | | | Kludge for #5048 -- serialization compatibility with 0.25.xMarkus Roberts2010-10-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 0.25.x the type & title of a resource were wrapped in a Puppet::Resource::Reference object whereas in 2.6.x they are attributes of the resource itself without the additional indirection (see 7089446697ad550c22012bc2b5572030727d67e1). When pson serialization is used this isn’t a problem but with formats in which we just blindly emit the structure either because we have no choice (marshal) or because we just use the default (yaml) it is a compatibility-breaking change. This patch resoloves the problem by adding a dummy reference object to cause the "correct" serialization; it is intended as a stop-gap for 2.6.x and should NOT be merged into next.
| | * | | | | | | (#4534/#4778) -- Normalize parameterized classesPaul Berry2010-10-276-127/+178
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a reconciliation/melding of Paul's (#4534) Class inheritance with parameterized classes is no longer ignored and Markus's Fix for #4778 -- evaluate parameterized classes when they are instantiated Extracted the code from Resource::Type#mk_plain_resource that evaluates parents and tags the catalog, and moved that into a new method called instantiate_resource. Instantiate_resource is now also called from Parser::Ast::Resource#evaluate, so that the notation "class { classname: }" now executes this code too. Likewise adds class evaluation so that it behaves the same (with regard to lazy / strict evaluation) as include classname
| | * | / / / / Fix for #5022 -- Escaped newlines should be elidedMarkus Roberts2010-10-182-1/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression, not covered by a test; previously the string "foo\ bar" would be interpreded as "foobar" but this was changed to "foo\\\nbar" in 2.6.x with my string interpolation refactor. This change restores the behaviour.
* | | | | | | Merge branch 'ticket/next/5150' into nextMatt Robinson2010-11-092-2/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * ticket/next/5150: (#5150) Make fact REST terminus configurable to connect to inventory service
| * | | | | | (#5150) Make fact REST terminus configurable to connect to inventory serviceMatt Robinson2010-11-052-2/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puppet masters can now set the inventory_server and inventory_port option to point to another puppet master that will function as the central inventory service. When agents connect to the puppet master, this will send fact data from the puppet master over REST to the inventory service. The puppet master itself will still store the client fact data in the local yaml dir by setting the cache class to yaml. Getting puppet masters to talk to each other using certs is difficult. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
* | | | | | Merge branch 'maint/next/add_local_branch_to_mail_patches' into nextPaul Berry2010-11-091-1/+12
|\ \ \ \ \ \
| * | | | | | Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"Paul Berry2010-11-091-1/+12
|/ / / / / /
* | | | | | Merge branch 'maint/next/clean_up_agent_spec' into nextPaul Berry2010-11-091-20/+21
|\ \ \ \ \ \
| * | | | | | Maint: remove unnecessary stubbing from agent_specPaul Berry2010-11-091-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The agent spec tests were stubbing out all methods related to Puppet settings, making it difficult to keep these tests maintained. The tests now function by setting the settings in question.
* | | | | | | Merge branch 'maint/next/missing_fileserver_requires' into nextPaul Berry2010-11-091-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Maint: Added missing requires to fileserver.rb.Paul Berry2010-11-091-0/+2
|/ / / / / /
* | | | | | Merge branch 'maint/next/forkbomb' into nextJesse Wolfe2010-11-091-0/+8
|\ \ \ \ \ \
| * | | | | | maint: prevent fork bombs by disabling ActiveSupport's Kernel.daemonizeJesse Wolfe2010-11-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport provides a "daemonize" method on all objects that causes the ruby process to fork to the background. This is extremely surprising and dangerous, and some of our spec tests could trigger this accidentally. This patch adds a "daemonize" method to Object which shadows the ActiveSupport version, preventing it from ever being called.
* | | | | | | Merge branch 'feature/next/cert_inspector' into nextJesse Wolfe2010-11-081-0/+140
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | maint: First draft of cert inspectorPaul Berry2010-11-081-0/+140
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script, ext/cert_inspector, takes directory names as command line arguments, searches those directories for SSL certificates, determines the type and contents of each cert, maps relationships between certificates, and prints a summary to standard out.