| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* ticket/2.6.x/2128_docstrings:
(#2128) Add WARNING for node_name_{fact,value} descriptions
(#2128) Whitespace only reflow commit
(#2128) In-line docs for node_name_{fact,value}
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Minor change to add a WARNING string as per feedback from UX.
Reviewed-by: Randall Hansen <randall@puppetlabs.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The output of puppet --genconfig was showing a blank line between the
description of the option and the default value line. This is because
of the here document being used in the first commit.
This change replaces the HERE document with a normal string that does
not contain a final newline.
In addition, the indentation of one of the default options was using 4
spaces instead of 2 and this has been corrected.
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change augments the in-line documentation for the node_name_fact and
node_name_value configuration settings. These settings will not work
effectively without additional changes elsewhere in the system, e.g. to
auth.conf.
In order to help the end user land softly if they choose to change these
settings, a short link URL we control and can redirect has been added
to each setting. These currently point to the community Wiki but may be
redirected to docs.puppetlabs.com in the future.
|
| |\ \ |
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, pointing a setting like 'confdir' at a symlink to a directory would
replace the symlink with a directory. This was because files created by
settings implicitly managed links, rather than following them. This behavior is
now changed so that file settings will follow links.
The behavior of these symlinks is the same as any other file resource. That is,
if the target of the symlink doesn't exist, Puppet will consider this an
error. Similarly, if the target of the symlink is a file, then the symlink
will still be replaced with a directory, rather than replacing its target.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
Reviewed-By: Dominic Maraglia <dominic@puppetlabs.com>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
These tests were assuming a master was already started when they were run,
which caused order-dependent failures. They will now start their own
masters, and use newer helper methods to run master and agent.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This adds the node_name_fact setting, which specifies a fact to use to
determine the node name. This allows dynamically determining the node name
without having to modify puppet.conf or command line options.
Using this setting requires modifying auth.conf to allow nodes to request
catalogs not matching their certnames.
For example, this would allow any authenticated node to retrieve any catalog:
# $confdir/auth.conf
path ~ /catalog/.+
allow *
The node_name_fact and node_name_value options are mutually exclusive, because
it is ambiguous which setting should take precedence.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Retrieving a catalog and getting the facts to submit with the catalog request
are distinct operations, and should be done separately. This is also to prepare
for adding the ability to determine the node name based on a fact, in which
case the node name needs to be determined before it is used for either the
catalog or the report.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The setting node_name_value may now be used for 'puppet apply' or 'puppet
agent' to specify the name for the node. This will not affect the certificate
used by the node, and the node will still be authenticated based on its
certname. The default value for node_name_value is the certname.
This is useful for eg. EC2 nodes whose random hostnames cannot be easily used
to classify them.
Paired-With: Jacob Helwig
|
| | |/
| |
| |
| |
| |
| |
| | |
These tests were stubbing when it was unnecessary, so replace much of it with
actual objects and files.
Paired-With: Jacob Helwig <jacob@puppetlabs.com>
|
| | |
| |
| |
| |
| |
| |
| | |
Some rearranging of the acceptance test directories caused some ruby
tests that referenced old shell tests to lose their relative paths.
Paired-with: Dominic Maraglia <dominic@puppetlabs.com>
|
| |\ \
| |/
|/|
| | |
'ticket/2.6.x/6885-puppet-agent-fingerprint-requires---verbose-to-return-a-value' into 2.6.x
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Always output the fingerprint to STDOUT, no matter what loglevel is used,
as that's the whole purpose of the comment.
Having to specify --verbose in addition to --fingerprint to get the finger
is nonsensical.
Update the spec test to stub @puppet puts, instead of the
Puppet.logging facilities.
Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>
|
| |\ \ |
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When we are asked to compile a catalog we need to update the set of known
resource types, along with the node declaration, from the pool of manifests on
disk. This is, obviously, a per-environment pool of resource types.
To reduce the scope of the race where an update to those manifest files on
disk can be updated during a compilation, we tried to cache the set of known
resources in the current thread at the start of compilation, then flush it
after compile finished and used the cache unconditionally if it was set.
Theoretically, this would assure us that we would parse the set of manifests
once, use them for the entire compile, flush the cache, and then carry on.
Practically, this was enforced as described: flush *after* the compile, assume
this would mean that it was clear at the start of the next compile.
That presumably worked more or less right until a change was made to push
extra data into the catalog at the start of the 2.6 series; that made
serialization of the catalog depend on the pool of known resource types.
When that happened we would reload the cache (and reparse the manifests)
during serialization, but after compilation ... and leave that in the thread
cache, so the precondition for the compiler was no longer true. It would see
the cache as of the end of the previous compile run, not the start of the next
compile run.
This, in turn, was what made Puppet wait for multiple runs of the agent before
showing you a change in your manifests under Passenger, but *not* under
Webrick: Passenger would reuse the same thread for the next request, cache in
place, while Webrick would create a new thread and (by side-effect) "flush"
the cache as the compiler expected.
To minimally fix this, with as little change of side-effect as possible, we
move the cache flush from after compile runs to before compile runs.
This might have minimal memory cost until another compile request runs in the
same thread, because we cache the data longer, but most models won't cause
that to be too much trouble.
Reviewed-By: Matt Robinson <matt@puppetlabs.com>
|
| |\ \ |
|
| |/ /
| |
| |
| |
| | |
Paired-with: Jacob Helwig <jacob@puppetlabs.com>
Reviewed-by: Dominic Maraglia <dominic@puppetlabs.com>
|
| |\ \ |
|
| |/ /
| |
| |
| |
| |
| |
| |
| | |
Older versions of egrep do not support the character class
"\s". Changed:
puppet resource service | egrep -B1 "ensure\s*=>.*'running"
to:
puppet resource service | egrep -B1 "ensure.*=>.*'running"
|
| |\ \ |
|
| |/| |
| | |
| | |
| | |
| | | |
* ticket/2.6.next/3836:
(#3836) External nodes should only capture stdout
|
| |/ /
| |
| |
| | |
This patch prevents stdout and stderr from being combined by Puppet::Util.execute, when used by Puppet::Indirector::Exec for external nodes.
|
| |\ \ |
|
| | | | |
|
| | |\ \ |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
2.6.next
* toddz/feature/2.6.next/vim-indenting:
vim: Initial ftplugin and indent support
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Vim's indent support makes it easier to automatically indent puppet
manifests.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* 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
|
| | |/ / /
| | | |
| | | |
| | | | |
file seems to use if so this should make things more consistant
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* ticket/2.6.x/6845:
(#6845) Mount writes incorrect vfstab entries
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Facter[:operatingsystem] will not retrieve the operatingsystem as a
string so puppet will always write fstab entries.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
2.6.next
* ticket/2.6.next/6442-agent_doesnt_need_namespaceauth:
(#6442) Be able to start agents --listen without namespaceauth.conf
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | |\ \ \ |
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Before this change when environment strings were read out of the storeconfigs
database, they were eventually converted up to Puppet::Node::Environment
objects. When these objects are returned to the storeconfigs database,
ActiveRecord dumps them as YAML, which begins the death-spiral of YAML.
This change makes it so the host will always store the environment as a string,
preventing the Puppet::Node::Environment object from being YAMLized, and stored
as such in the database.
This change was based on one by Richard Crowley.
Paired-with: Jacob Helwig <jacob@puppetlabs.com>
Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
Signed-off-by: Richard Crowley <r@rcrowley.org>
|
| | | | | | | |
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions' into 2.6.next
* tickets/2.6.x/6487-help-directoryservice-provider-work-on-future-OSX-versions:
(#6487) Add some testing for OS X version support in DirectoryService provider
(#6487) Directoryservice provider will fail in future OS releases
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This adds some basic testing around whether url, or plist data is used
for the various versions of OS X. Unfortunately this involves
stubbing larger sections of the implementation than we'd like, but
this did not attempt to re-structure the implementation at all.
Paired-with: Josh Cooper <josh@puppetlabs.com>
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit removes a case statement in the get_exec_pramble and
single_report methods. In its place is an if statement that will
cause Puppet to fail if its being run on an OS X system with a version
< 10.4. This if-statement will also allow Puppet to run in 10.7.
Signed-off-by: Gary Larizza <ccshots@gmail.com>
|
| | |\ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When we moved code from the compiler to parser/resource, we lost
a conditional that prevented defined resources from gaining containment
edges to stages. Adding a stage to a defined resource was usually
harmless, but it violated the invariant of "resources should only have
exactly one container as their direct parent", producing a 50% chance of
a malformed containment path in log messages.
Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The "send" method in the stomp gem has been deprecated since:
http://gitorious.org/stomp/mainline/commit/d542a976028cb4c5badcbb69e3383e746721e44c
It's been replaced with the "publish" method.
Also renamed the send_message method to publish_message more in
keeping with language used in queuing.
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
2.6.next
* tickets/2.6.x/4655-parameterized-classes-default-stages:
(#4655) Allow stage to be set using a default class parameter
Updated CHANGELOG for 2.6.8rc1
|
