[puppetlabs/puppet] bd292a: (PUP-3258) node exec indirector: default to enviro...

[GitHub]

Branch: refs/heads/stable
Home: https://github.com/puppetlabs/puppet
Commit: bd292a6ec58d4827e12afa74b480c235ce8eccbc
https://github.com/puppetlabs/puppet/commit/bd292a6ec58d4827e12afa74b480c235ce8eccbc
Author: Felix Frank <Felix...@Alumni.TU-Berlin.de>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M lib/puppet/indirector/node/exec.rb
M spec/integration/application/apply_spec.rb

Log Message:
-----------
(PUP-3258) node exec indirector: default to environment, not its name

Nodes can be classified through a local executable that prints YAML with
a node specification. This is enabled through the node_terminus=exec option.
Since PUP-2519, this setting would break `puppet apply`. Trying to apply
any manifest would lead to Puppet applying the default environment's site
manifest instead.

The reason for this is that the node terminus will include the current
environment's name in the node lookup result. This in turn makes Puppet
look up the environment per name. This is not the desired behavior, because
Application::Apply performs the lookup and further operations with a localized
environment that overrides the site manifest.

Solved by including the current environment object in the returned node object
instead of its name.


Commit: 0a21e4e659ec0301b6bd669ea00fd32ea3bc5bef
https://github.com/puppetlabs/puppet/commit/0a21e4e659ec0301b6bd669ea00fd32ea3bc5bef
Author: Felix Frank <Felix...@Alumni.TU-Berlin.de>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Changed paths:
M spec/integration/application/apply_spec.rb

Log Message:
-----------
(maint) reduce repitition in Application::Apply integration spec


Commit: 6887e26a3ef48538777200826d824a7561951211
https://github.com/puppetlabs/puppet/commit/6887e26a3ef48538777200826d824a7561951211
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)

Changed paths:
M spec/integration/application/apply_spec.rb
M spec/lib/puppet_spec/files.rb

Log Message:
-----------
(maint) Remove duplicate file handling code

The tests had their own way of creating files and directories for
testing. All of these different ways of creating files and directories
already existed in PuppetSpec::Files. This unifies them.


Commit: 766cce7ff953b63698a7a4c819e6b21b60703c6d
https://github.com/puppetlabs/puppet/commit/766cce7ff953b63698a7a4c819e6b21b60703c6d
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)

Changed paths:
M lib/puppet/indirector/node/exec.rb
M spec/integration/application/apply_spec.rb
M spec/lib/puppet_spec/files.rb

Log Message:
-----------
Merge branch 'pr/3144' into stable

* pr/3144:
(maint) Remove duplicate file handling code
(maint) reduce repitition in Application::Apply integration spec
(PUP-3258) node exec indirector: default to environment, not its name

Closes GH-3144


Compare: https://github.com/puppetlabs/puppet/compare/8df1aa9914bf...766cce7ff953

[GitHub]

Branch: refs/heads/master

Commit: 378b656d9de32b644c16e0e3f3e6aefd45af4304
https://github.com/puppetlabs/puppet/commit/378b656d9de32b644c16e0e3f3e6aefd45af4304
Author: Jeff McCune <je...@puppetlabs.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths:
M lib/puppet/parser/compiler.rb
M spec/unit/parser/compiler_spec.rb

Log Message:
-----------
(PUP-3351) Evaluate ENC classes in the correct order

Without this patch classes declared from an ENC are evaluated in the
wrong order. This is a problem because classes declared without
parameters are evaluated prior to classes with parameters which causes
an Error: Duplicate declaration when the classes with parameters are
evaluated. According to the code comments for the
`evaluate_node_classes` method, the expected behavior is that classes
with an empty set of parameters will not conflict with classes that have
declared parameters.


Commit: b62ec8c7d1c3f7c6a34e804f0c568275e77a2aa4
https://github.com/puppetlabs/puppet/commit/b62ec8c7d1c3f7c6a34e804f0c568275e77a2aa4
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths:
M lib/puppet/parser/compiler.rb
M spec/unit/parser/compiler_spec.rb

Log Message:
-----------
(PUP-3351) Test using example of problematic behavior

After talking with Reid Vandewiele, it turns out that the problematic
behavior isn't directly the order of the classes themselves. Previous
assertions that there are possible conflicts from the classes when they
were done in one order or another are incorrect. The classes, when any
have parameters, are kept by the node in a hash keyed off of the class
name, which means that there is no possibility of them creating a
duplicate resource error.

The actual usecase comes down to *how* parameterized classes vs
unparameterized classes are often used. A parameterized class can often
be simply a set of shared data that the unparameterized classes depend
on (or inherit from) parameterized classes.

This modifies the test case for the reordering change to provide an
example of the use case here.


Commit: e19552a098258daab0894befcb8d7ef73a60e715
https://github.com/puppetlabs/puppet/commit/e19552a098258daab0894befcb8d7ef73a60e715
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths:
M lib/puppet/parser/compiler.rb
M spec/unit/parser/compiler_spec.rb

Log Message:
-----------
Merge branch 'pr/3126' into stable

* pr/3126:
(PUP-3351) Test using example of problematic behavior
(PUP-3351) Evaluate ENC classes in the correct order

Closes GH-3126


Commit: c157bc9c2ee6422457bcb2bda70eadbf465c7c6c
https://github.com/puppetlabs/puppet/commit/c157bc9c2ee6422457bcb2bda70eadbf465c7c6c
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2014-10-03 (Fri, 03 Oct 2014)

Changed paths:
M lib/puppet/indirector/node/exec.rb
M lib/puppet/parser/compiler.rb
M spec/integration/application/apply_spec.rb
M spec/lib/puppet_spec/files.rb
M spec/unit/parser/compiler_spec.rb

Log Message:
-----------
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
(PUP-3351) Test using example of problematic behavior
(PUP-3351) Evaluate ENC classes in the correct order

(maint) Remove duplicate file handling code
(maint) reduce repitition in Application::Apply integration spec
(PUP-3258) node exec indirector: default to environment, not its name

Compare: https://github.com/puppetlabs/puppet/compare/2cb0741cbd39...c157bc9c2ee6