summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | (#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 branch 'next'Paul Berry2010-11-1025-193/+568
|\| | | | | | | | | | | | | | | | | | | This marks the end of the agile iteration from 11/3-11/10.
| * | | | 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.
| * | | | | | Bookkeeping: Merge commit '9e2a0e4' into nextJesse Wolfe2010-11-040-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | This synchronizes merge commits between master and next.
* | | | | | | Merge branch 'next'Jesse Wolfe2010-11-0326-1113/+495
|\| | | | | | | |/ / / / / |/| | | | | | | | | | | This marks the end of our first agile iteration.
| * | | | | Merge branch 'maint/next/remove-request-object-from-rest-api' into nextJesse Wolfe2010-11-0214-1108/+95
| |\ \ \ \ \
| | * | | | | Maint: Remove Indirector::Request objects from HTTP Handler and API V1Jesse Wolfe2010-11-0214-1108/+95
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a maintenance refactor to reduce the dependencies between the rest API and the implementation of the Indirector. The HTTP Handler code was creating temporary Request objects that were not actually being passed to the Indirector.
| * | | | | Merge branch 'ticket/next/5166' into nextPaul Berry2010-11-012-37/+162
| |\ \ \ \ \
| | * | | | | (#5166) Inventory service is now searchable by timestamp.Paul Berry2010-11-012-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to specify queries in the form “meta.timestamp.xx” where xx is eq,ne,gt,lt,ge,le when searching the inventory service.
| | * | | | | Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding ↵Paul Berry2010-11-011-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | freshness check
| | * | | | | Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshnessPaul Berry2010-11-011-17/+29
| |/ / / / /
| * | | | | Merge branch 'ticket/next/5164' into nextJesse Wolfe2010-11-013-7/+23
| |\ \ \ \ \
| | * | | | | Fix #5164 Change Facts timestamp when they are received by the masterJesse Wolfe2010-11-013-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch causes the puppet master to re-timestamp facts when they are received by the catalog compiler terminus. This makes the timestamps more trustworthy, as it means that they are all based upon the same clock's time. Paired-With: Paul Berry <paul@puppetlabs.com>
| | * | | | | Maint: Don't use a stub for a Facts object in the compiler specsJesse Wolfe2010-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The catalog compiler spec was overstubbing the Node::Facts object, making it hard to test the interaction between those two systems.
| | * | | | | Maint: spec/unit/indirector/catalog/compiler_spec.rb wouldn't run by itselfJesse Wolfe2010-11-011-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Require puppet/rails so we can run this test alone.
| * | | | | Merge branch 'ticket/next/4894' into nextMatt Robinson2010-10-282-7/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/next/4894: [#4894] Randomize port on webrick tests