Allow to set node_terminus variable#921
Conversation
9422ede to
d5ca407
Compare
Allow to override default value of [server]/node_terminus in puppet.conf Useful in case of standalone (non-Foreman) Puppet Server installs without an ENC. Tests are updated as now without Foreman, node terminus is explicitly set to the default 'plain' value Reference https://www.puppet.com/docs/puppet/8/configuration.html#node-terminus
d5ca407 to
87a6f6d
Compare
| $trusted_external_command = $puppet::server::trusted_external_command | ||
| $primary_envs_dir = $puppet::server::envs_dir[0] | ||
|
|
||
| if $server_external_nodes and $server_external_nodes != '' { |
There was a problem hiding this comment.
I think we should look at $server_node_terminus and only when it's set to exec this should we include the ENC. So perhaps:
if $server_node_terminus == 'exec' {
class { 'puppet::server::enc':
node_terminus => $server_node_terminus,
enc_path => $server_external_nodes,
}
}Ideally we would change $server_external_nodes to Optional[Stdlib::Absolutepath] then and drop empty string handling. That could be considered a breaking change, but I think it's for the better.
I haven't look at all at the consequences of this so there's a good chance I'm missing something.
There was a problem hiding this comment.
Thanks, as there also is classifier option I think in that case it must be written. Maybe there also are some changes to do in the without foreman tests, as it might be possible to not want the Foreman integration but use an ENC
Co-authored-by: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
node_terminus should default to exec and write nothing if set to plain
|
I bumped into this when setting new environment. As a workaround until solution is merged into new version of the module. I used this ugly code for dummy node.rb: and Ugly but simple and works. We use just plain puppet no foreman or whatsoever. A proper solution would be to just use "node_terminus = plain". |
Allow to override default value of [server]/node_terminus in puppet.conf.
Useful in case of standalone (non-Foreman) Puppet Server installs without an ENC.