summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge branch '2.6.x' into 2.7.nextDaniel Pittman2011-05-127-10/+183
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next version of the code. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | | Merge branch '2.6.next' into 2.6.xDaniel Pittman2011-05-1229-103/+457
| | | |\ \ \ \
| | | | * | | | adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| | | | | | | |
| | | | * | | | Merge branch 'ticket/2.6.next/7139' into 2.6.nextNick Lewis2011-05-032-1/+8
| | | | |\ \ \ \
| | | | | * | | | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was unconditionally removing the trailing file separator ('/'), which is only valid when the file separator isn't the entire path. This fixes 'puppet resource file <path>'. Paired-With: Jacob Helwig
| | | | * | | | Merge remote-tracking branch 'toddz/feature/2.6.next/vim-indenting' into ↵Max Martin2011-04-283-1/+172
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * toddz/feature/2.6.next/vim-indenting: vim: Initial ftplugin and indent support
| | | | | * | | | vim: Initial ftplugin and indent supportTodd Zullinger2011-04-023-1/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vim's indent support makes it easier to automatically indent puppet manifests.
| | | | * | | | | Merge branch 'ticket/2.6.next/6844' into 2.6.nextMax Martin2011-04-281-2/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/6844: case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make things more consistant
| | | | | * | | | | case seems needless here as there is only two opts, also the rest of the ↵ben hengst2011-04-281-2/+1
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | file seems to use if so this should make things more consistant
| | | | * | | | | Merge branch 'ticket/2.6.x/6845' into 2.6.nextJames Turnbull2011-04-281-1/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.x/6845: (#6845) Mount writes incorrect vfstab entries
| | | | | * | | | | (#6845) Mount writes incorrect vfstab entriesStefan Schulte2011-04-281-1/+1
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Facter[:operatingsystem] will not retrieve the operatingsystem as a string so puppet will always write fstab entries.
| | | | * | | | | Merge branch 'ticket/2.6.next/6442-agent_doesnt_need_namespaceauth' into ↵Matt Robinson2011-04-272-3/+3
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.6.next * ticket/2.6.next/6442-agent_doesnt_need_namespaceauth: (#6442) Be able to start agents --listen without namespaceauth.conf
| | | | | * | | | | (#6442) Be able to start agents --listen without namespaceauth.confMatt Robinson2011-04-272-3/+3
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The namespaceauth.conf isn't being used since we switched from XMLRPC to Rest. There's still a lot of cleanup of the code that deals with authorization from the namespaceauth.conf and XMLRPC in general, but that can be address later. For now just being able to start puppet agent in listen mode without a useless file will be a big win. You still need the auth.conf file though since that is used. Reviewed-by: Max Martin <max@puppetlabs.com>
| | | * | | | | | Update CHANGELOG for 2.6.8Jacob Helwig2011-04-271-2/+5
| | | | | | | | |
| | | * | | | | | add test for ticket 7101Dominic Maraglia2011-04-261-0/+25
| | | | | | | | |
| | | * | | | | | Move tests from puppet-acceptance repoDominic Maraglia2011-04-2092-0/+2045
| | | | | | | | |
| | * | | | | | | Merge branch '2.7.x' into 2.7.nextDaniel Pittman2011-05-06122-1028/+2737
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: * spec/unit/node/facts_spec.rb Updates: * spec/unit/interface/action{,_builder}_spec.rb => update for 'when_invoked' block being required.
| | | * | | | | | Updated CHANGELOG for 2.7.0rc2Daniel Pittman2011-05-061-0/+163
| | | | | | | | |
| | | * | | | | | Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.xDaniel Pittman2011-05-055-60/+18
| | | |\ \ \ \ \ \
| | | | * | | | | | (#7353) Remove :for_humans format entirely.Daniel Pittman2011-05-055-60/+18
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we never shipped this in a real release, we don't need to maintain compatibility. So, remove it entirely from the codebase. Reviewed-By: Max Martin <max@puppetlabs.com>
| | | * | | | | | Merge remote-tracking branch 'nfagerlund/ticket/2.7.x/6962' into 2.7.xDaniel Pittman2011-05-0520-37/+438
| | | |\ \ \ \ \ \
| | | | * | | | | | (Maint) Adjust documentation whitespacenfagerlund2011-05-0418-223/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch from issue #7221 permits indented heredocs. This patch takes advantage of that to make the doc strings less messy.
| | | | * | | | | | (#7303) Remove reference to not-yet-extant man actionnfagerlund2011-05-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We haven't implemented the `man` action yet, so let's not mention it until we have.
| | | | * | | | | | (#6962) Add self-documentation data to puppet facesnfagerlund2011-05-0418-27/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds documentation strings to most of the faces, actions, and options introduced in 2.7.0. There are a small number of TK notes remaining, and longer strings have not been indented to take advantage of the patch from issue #7221.
| | | | * | | | | | Maint: adjust faces.rb's help to match that of other applicationsnfagerlund2011-05-041-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faces isn't a face, interestingly, so it doesn't get a summary line in the puppet help. This will output the appropriately-formatted manpage text using the normal mechanism.
| | | * | | | | | | Adding test for ticket 7139Dominic Maraglia2011-05-051-0/+11
| | | | | | | | | |
| | | * | | | | | | add clean-up step to test for ticket_5477 to prevent site.pp from leaking to ↵Dominic Maraglia2011-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other tests
| | | * | | | | | | fixed test for ticket_7117Dominic Maraglia2011-05-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to restart puppet master to detect changes made to auth.conf
| | | * | | | | | | Merge branch 'tickets/2.7.x/7179' into 2.7.xPieter van de Bruggen2011-05-043-12/+7
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | (#7179) Modify default ACL for /node/<name>.Pieter van de Bruggen2011-05-043-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, it is useful to permit an individual node to query information about itself, and there is no good reason to reject this by default. Paired-With: Nick Lewis
| | | * | | | | | | Merge branch 'tickets/2.7.x/7304' into 2.7.xNigel Kersten2011-05-041-6/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | (#7304) Remove full puppet help output when subcommand cannot be foundNigel Kersten2011-05-041-6/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make the error message more visible to the user, we tell them about the puppet help command but don't automatically run it, so the error doesn't scroll off the screen. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
| | | * | | | | | | adding test for ticket 7117Dominic Maraglia2011-05-041-3/+5
| | | | | | | | | |
| | | * | | | | | | Merge branch ↵Daniel Pittman2011-05-048-52/+141
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'bug/2.7.x/7353-unify-face-rendering-with-network-formathandler' into 2.7.x
| | | | * | | | | | | (#7353) Note the :for_humans compatibility issue.Daniel Pittman2011-05-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where we need special support for :for_humans as an alias for :console, call it out in comments. This makes it clear to someone who wonders why what the actual underlying purpose of the whole thing is. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | | * | | | | | | (#7353) Use :console rendering format in our own code.Daniel Pittman2011-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have unified things, stop using the compatibility name in favour of the new :console name for the output format. No functional effect beyond avoiding a deprecated output mode. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | | * | | | | | | (#7353) Unify rendering in the face_bace application.Daniel Pittman2011-05-042-50/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now move over to using only network FormatHandler rendering code for output, ditching all the support we had in the application. We include a compatibility shim to ensure that the :for_humans format that was supported for a while is now an alias for the :console format we are using moving forward. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | | * | | | | | | (#7353) Add 'console' format to FormatHandlerDaniel Pittman2011-05-042-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a console rendering format to the Network FormatHandler subsystem; it provides the same human-friendly textual rendering as the Faces application did, except it uses JSON rather than PP as the fall-back rendering mode. This paves the path for unification of all formatting into the same subsystem, rather than the half-measures we used to have. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
| | | * | | | | | | | Merge branch '2.7.x' of github.com:puppetlabs/puppet into 2.7.xDominic Maraglia2011-05-0317-24/+93
| | | |\| | | | | | |
| | | | * | | | | | | Merge branch ↵Daniel Pittman2011-05-034-15/+24
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'bug/2.7.x/7277-improve-secret-agent-face-and-supporting-actions' into 2.7.x
| | | | | * | | | | | | (#7277)Fixing all secret-agent functions, and the agent itselfLuke Kanies2011-05-034-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the behaviours and ensures that we have parity between the basic actions of the agent and the secret_agent. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com> Signed-off-by: Luke Kanies <luke@puppetlabs.com>
| | | | * | | | | | | | Merge branch 'ticket/2.7.x/7139' into 2.7.xNick Lewis2011-05-032-1/+8
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | (#7139) Accept '/' as a valid path in filesetsNick Lewis2011-05-032-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was unconditionally removing the trailing file separator ('/'), which is only valid when the file separator isn't the entire path. This fixes 'puppet resource file <path>'. Paired-With: Jacob Helwig
| | | | * | | | | | | | (#7329) Consistent naming for rendering formats and hooks.Daniel Pittman2011-05-033-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We refer to rendering formats pretty consistently as `json`, `yaml`, `s`, and so forth; unqualified names. On the other hand, we refer to the rendering hooks *mostly* as `to_*`, except the `:for_humans` and `:json` formats. Which is kind of confusing because of the internal inconsistency, and because it doesn't match the public name. Fix the code to resolve both, so the `to_*` format still works, but we mostly expect to use the `*` version, to match public expectation.
| | | | * | | | | | | | Merge branch 'bug/2.7.x/7326-faces-broken-on-ruby-1.8.5' into 2.7.xDaniel Pittman2011-05-031-1/+4
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | (#7326) Fix faces on Ruby 1.8.5Daniel Pittman2011-05-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that String#each_line on Ruby 1.8.5 only takes a block, and will not return an enumerable. Rewrite to use split(/\n/) which has the same effect but works on all our platforms.
| | | | * | | | | | | | Merge branch 'tickets/2.7.x/7117-authconf-should-respect-environments' into ↵Jacob Helwig2011-05-032-3/+7
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.7.x * tickets/2.7.x/7117-authconf-should-respect-environments: (#7117) Return the environment as a Puppet::Node::Environment in uri2indirection
| | | | | * | | | | | | (#7117) Return the environment as a Puppet::Node::Environment in uri2indirectionJacob Helwig2011-05-032-3/+7
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The environment returned by uri2indirection used to be a Puppet::Node::Environment. When this changed to simply being the string of the environment name, this broke assumptions made in other areas of the code. Paired-with: Nick Lewis <nick@puppetlabs.com>
| | | | * | | | | | | Merge branch ↵Daniel Pittman2011-05-036-2/+27
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'bug/2.7.x/7276-return-value-from-plugin-download-is-not-user-friendly' into 2.7.x
| | | | | * | | | | | | (#7276) Better reporting from the plugin download action.Daniel Pittman2011-05-032-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just returning vague values, return useful information when rendering for a human being. Based on work by Luke Kaines <luke@puppetlabs.com> in https://github.com/lak/puppet/commit/a61cc770ca9b2cad744b5b21b9776a834d6ca895 Reviewed-By: Pieter van de Bruggen <pieter@puppetlabs.com>