summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add puppet master polling step for ticket 7117Dominic Maraglia2011-05-201-1/+11
| | | | | | | | The test for ticket 7117 producedes spurious failures due to timing: a curl command is executed from an agent to a freshly started Puppet Master; if the Puppet Master is not ready to accept the connection the test will fail. Added an until loop that issues simple curl command to see if the Puppet Master is up and ready
* Merge branch 'ticket/2.7.x/7507' into 2.7.xJosh Cooper2011-05-201-2/+2
|\ | | | | | | | | * ticket/2.7.x/7507: (#7507) Add exclude filter for ruby 1.9 spec failures
| * (#7507) Add exclude filter for ruby 1.9 spec failuresJosh Cooper2011-05-201-2/+2
| | | | | | | | | | | | | | Exclude spec test for multiple writer processes as this fails intermittently on ruby 1.9. Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
* | Merge branch 'ticket/2.7.x/7507' into 2.7.xJosh Cooper2011-05-204-9/+9
|\| | | | | | | | | | | * ticket/2.7.x/7507: (#7502) Fixed parser spec for ruby 1.8.5 (#7507) Add more 1.9 filters
| * (#7502) Fixed parser spec for ruby 1.8.5Josh Cooper2011-05-201-2/+2
| | | | | | | | | | | | | | The first method is not available on Enumerable in ruby 1.8.5, so when it is mixed into ASTArray, you can't call first. Reviewed-By: Matt Robinson <matt@puppetlabs.com>
| * (#7507) Add more 1.9 filtersJosh Cooper2011-05-203-7/+7
|/ | | | | | Additionally we fixed a scoping issue with the File type. Paired-With: Matt Robinson <matt@puppetlabs.com>
* Merge branch '2.7.next' into 2.7.xMatt Robinson2011-05-1963-1568/+2186
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.next: (42 commits) (#6395) Add extpuppet help, eval, and interfaces Adding a sleep state post starting master maint: fix spec_helper inclusions again. (#7523) Refactor the grammar to reduce duplication (#7114) Fix specs for ssh authorized key parsed provider (#7114) Target returns correct value (#7114) Add integration tests for authorized_key (#7114) Improve unit tests for ssh_authorized_key (#7114) Improve value validation for authorized_key (#7300) Fix instances method of mount provider (#7259) Remove ActiveRecord requirement from indirector face spec (#7259) Do not try to load all Terminus classes when configuring the Indirector (#3836) External nodes should only capture stdout Revert "(#7220) Add the ability to "inherit" options." maint: sync 'authconfig' to 'rest_authconfig' setting adding test for ticket 7139 (#7139) Accept '/' as a valid path in filesets (#7300) Add specs for the mount provider 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 (#6845) Mount writes incorrect vfstab entries ...
| * Merge branch 'feature/2.7.next/6395_envpuppet' into 2.7.nextJeff McCune2011-05-191-3/+56
| |\ | | | | | | | | | | | | * feature/2.7.next/6395_envpuppet: (#6395) Add extpuppet help, eval, and interfaces
| | * (#6395) Add extpuppet help, eval, and interfacesJeff McCune2011-05-191-3/+56
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add three features to the envpuppet helper script. First, if --help is passed as the first argument, a helpful message is printed. Second, if ENVPUPPET_BLEEDING=true when envpuppet is executed, additional repositories are enabled. The only addition at this time is puppet-interfaces, which heavily modifies the behavior of Puppet itself and may or may not be desired. Third, if no arguments are passed to the script, bourne compatible shell statements are printed to STDOUT which may be directly evaluated in the current shell. This is to help people who prefer to directly set RUBYLIB and PATH in their development workflows, which I've noticed to be the case for many people. For example: eval $(envpuppet) Signed-off-by: Jeff McCune <jeff@puppetlabs.com> Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
| * Merge branch '2.7.x' into 2.7.nextMichael Stahnke2011-05-181-0/+20
| |\
| * \ Merge branch '2.6.x' into 2.7.nextPieter van de Bruggen2011-05-183-8/+8
| |\ \
| | * \ Merge branch '2.6.next' into 2.6.xPieter van de Bruggen2011-05-183-8/+8
| | |\ \
| | | * | Merge branch 'ticket/2.6.next/3836' into 2.6.nextMax Martin2011-05-133-8/+8
| | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/2.6.next/3836: (#3836) External nodes should only capture stdout
| | | * | (#3836) External nodes should only capture stdoutOliver Hookins2011-05-133-8/+8
| | |/ / | | | | | | | | | | | | This patch prevents stdout and stderr from being combined by Puppet::Util.execute, when used by Puppet::Indirector::Exec for external nodes.
| * | | Adding a sleep state post starting masterDominic Maraglia2011-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasional spurious errors seen when running this test -- curl reports an SSL protocol error; I suspect this is actually a timing issue related to starting up the master and not being ready to to accecpt connections.
| * | | Merge branch 'ticket/2.7.next/7523' into 2.7.nextNick Lewis2011-05-175-1278/+1010
| |\ \ \
| | * | | (#7523) Refactor the grammar to reduce duplicationNick Lewis2011-05-175-1278/+1010
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit unifies some paths in the grammar, which had previously been duplicated to avoid shift/reduce conflicts. Merging these paths together and separating only the conflicting structures leads to a cleaner grammar, with fewer holes. Several bugs are fixed as a result: (#3129) Nested class names beginning with numbers work correctly (#5268) Hyphens in class names work correctly (#5817) Hashes and arrays can now be passed to functions (hashes require parentheses) Additionally, expressions are now legal in most places where they would make sense, when previously only bare rvalues were allowed. Paired-With: Markus Roberts Reviewed-By: Matt Robinson
| * | | | maint: fix spec_helper inclusions again.Daniel Pittman2011-05-1717-45/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We got rid of the '../../spec_helper' style requires, but a few of them snuck back in in recent changes. This purges them out, replaced with the header: #!/usr/bin/env rspec require 'spec_helper' Reviewed-By: Nick Lewis <nick@puppetlabs.com>
| * | | | Merge branch '2.7.x' into 2.7.nextPieter van de Bruggen2011-05-1775-203/+203
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'ticket/2.7.next/7114' into 2.7.nextNick Lewis2011-05-165-108/+420
| |\ \ \ \
| | * | | | (#7114) Fix specs for ssh authorized key parsed providerNick Lewis2011-05-161-32/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests were unnecessarily creating a stub resource, as well as failing to re-initvars on the provider before each test. This led to test ordering failures, and incompatibilities with the other commits in this series. Now we use a real resource, and properly reinitialize before each test. Paired-With: Josh Cooper
| | * | | | (#7114) Target returns correct valueStefan Schulte2011-05-161-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the ssh_authorized_key parsedfile provider to return the current target value instead of the should value. Without this change puppet always thinks that the target property is in sync and thus will never move one key to the correct file. Reviewed-By: Nick Lewis Reviewed-By: Josh Cooper
| | * | | | (#7114) Add integration tests for authorized_keyStefan Schulte2011-05-161-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to show the issue that one key is not moved from one keyfile to another keyfile if target is not in sync. Reviewed-By: Nick Lewis Reviewed-By: Josh Cooper
| | * | | | (#7114) Improve unit tests for ssh_authorized_keyStefan Schulte2011-05-161-70/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to check if the type supports valid values for all the properties. Also check if the type rejects values that are invalid. Reviewed-By: Nick Lewis Reviewed-By: Josh Cooper
| | * | | | (#7114) Improve value validation for authorized_keyStefan Schulte2011-05-161-0/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespaces in any of the properties can lead to incorrect entries in the authorized_keys file. Reviewed-By: Nick Lewis Reviewed-By: Josh Cooper
| * | | | Merge branch 'ticket/2.7.x/7300' into 2.7.nextNick Lewis2011-05-162-0/+59
| |\ \ \ \
| | * | | | (#7300) Fix instances method of mount providerStefan Schulte2011-05-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The instance method now behaves like the prefetch method: After parsing /etc/(v)fstab run mount to update the ensure state from either :unmounted to :mounted and from :absent to :ghost Reviewed-By: Nick Lewis Reviewed-By: Josh Cooper
| | * | | | (#7300) Add specs for the mount providerStefan Schulte2011-05-011-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs to demonstrate that the instances method is currently broken because it does not take the actual mountstate into account. As a result running "puppet resource mount" on the commandline will report every mount that appears in /etc/(v)fstab as unmounted.
| * | | | | Merge branch ↵Jacob Helwig2011-05-162-3/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tickets/2.7.x/7259-make-active-record-test-requirement-optional' into 2.7.next * tickets/2.7.x/7259-make-active-record-test-requirement-optional: (#7259) Remove ActiveRecord requirement from indirector face spec (#7259) Do not try to load all Terminus classes when configuring the Indirector
| | * | | | | (#7259) Remove ActiveRecord requirement from indirector face specJacob Helwig2011-05-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "should be able to return a list of terminuses for a given indirection" was calling Puppet::Indirector::Face.terminus_classes, which is just a thin wrapper around Puppet::Indirector::Terminus.terminus_classes, which would attempt to load all Terminus classes. This would cause problems if not all of the prerequisites for all of the Terminus classes were installed (For example: ActiveRecord). Now we only test that the thin wrapper appropriately munges the output from Puppet::Indirector::Terminus.terminus_classes, since the method being wrapped should have its own tests for the behavior that was being tested originally. Paired-with: Nick Lewis <nick@puppetlabs.com>
| | * | | | | (#7259) Do not try to load all Terminus classes when configuring the IndirectorJacob Helwig2011-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring the Indirector routes, we should only try loading the Terminus classes that are referenced by the configuration. Previously, we were loading all Terminus classes, which would cause errors if we didn't have all of the prerequisites for all of them, even if the ones with missing prerequisites weren't being used by the configuration. Paired-with: Nick Lewis <nick@puppetlabs.com>
| * | | | | | Merge branch '2.7.x' into 2.7.nextMatt Robinson2011-05-134-61/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7.x: (#7469) Add license to test face so tests pass (#7264) Docs: Clarify that subscribe/notify imply require/before (#7468) Stub spec that tries to connect to pypi.python.org Prevent spec failure caused by network device mock leak Fix #7299 - do not require net/ssh for running rake spec Resolved Conflicts: lib/puppet/util/network_device.rb spec/unit/util/network_device_spec.rb
| * | | | | | Revert "(#7220) Add the ability to "inherit" options."Daniel Pittman2011-05-124-136/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9329a1f33b4d7df81ad8661de74f8a3656428570. Conflicts: spec/unit/interface/action_builder_spec.rb spec/unit/interface/action_spec.rb
| * | | | | | maint: sync 'authconfig' to 'rest_authconfig' settingDaniel Pittman2011-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We changed the name of the authconfig setting to specify 'rest_', but this branch merge didn't sync the change through all the tests. Now resolved by renaming the configuration option in the test also. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
| * | | | | | 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
| | | | | | | | |