(#16698) Do not set Node cache_terminus for storedconfigs#1220
Merged
joshcooper merged 2 commits intopuppetlabs:3.0.xfrom Oct 11, 2012
Merged
Conversation
The hook on the storedconfigs setting would try and setup the terminuses so that they were properly wired up to the store configs. One part of this was to set the `cache_terminus` for the `Puppet::Node` to `:store_configs`. However, up until commit 5a79d9a this was overridden by the master application to be `:yaml`. That commit removed this so that an ENC was able to be authoritative, but once it was removed the store configs cache terminus was left on and interferred with the ENC. This commit removes the cache for the `Puppet::Node` since there is no need for it and all it does is interfere with fetching node data. The `Puppet::Node::Facts` store configs code will actually create the entry in the `host` table that is needed.
This adds a simple test that the ENC is not shadowed by the store configs. There is no check that the store configs actually can be used. That is another whole that should be plugged at another time.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The hook on the storedconfigs setting would try and setup the terminuses
so that they were properly wired up to the store configs. One part of this
was to set the
cache_terminusfor thePuppet::Nodeto:store_configs. However, up until commit5a79d9a this was overridden by the master
application to be
:yaml. That commit removed this so that an ENC wasable to be authoritative, but once it was removed the store configs
terminus was left on.
This commit removes the cache for the
Puppet::Nodesince there is noneed for it and all it does is interfere with fetching node data. The
Puppet::Node::Factsstore configs code will actually create the entry inthe
hosttable that is needed.