Fix for issue 185. #186
Fix for issue 185. #186
Conversation
…hiera_config value is detected (much the same as is done when different facter facts are used). When this condition is detected, Puppet's internally cached instande of Hiera is also cleared so that the catalog can be recompiled agsint the differently configured Hiera.
|
Looks like the tests broke because of the new Rake minor release that dropped a Ruby version. Those that didn't break are all green though. So 👍. |
| catalogue = build_catalog(node_name, facts_hash(node_name), code) | ||
| hiera_config_value = self.respond_to?(:hiera_config) ? hiera_config : nil | ||
|
|
||
| catalogue = build_catalog(node_name, facts_hash(node_name), hiera_config_value, code) |
There was a problem hiding this comment.
I don't understand why these two lines have been added... Could you help me understand?
It seems like hiera_config_value is never actually used in the build_catalog_without_cache method.
There was a problem hiding this comment.
The trick seems to be that adding the configuration as additional argument will change the cache key used in build_catalog(). Without this, the cached catalog is returned unchanged.
|
I've gotta think on this one a bit longer before I merge it in... I'm interested in trying to get something a bit more "clean" from an interface or API point of view. |
|
I could reproduce the problem local, setting :hiera_config seems to leak across specs. I can also attest to the fact that the fix works for me with puppet 3.8.1 and puppet 4. Moving the second chunk to |
This will recompile the catalog when a different :hiera_config value is detected (much the same as is done when different facter facts are used). When this condition is detected, Puppet's internally cached instance of Hiera is also cleared so that the catalog can be recompiled against the differently configured Hiera.