Allow to set node_terminus variable #921
Open
Conversation
This file contains 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
d1nuc0m
force-pushed
the
server_terminus_variable
branch
2 times, most recently
from
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
d1nuc0m
force-pushed
the
server_terminus_variable
branch
from
d5ca407
to
87a6f6d
Compare
ekohl
reviewed
Nov 22, 2024
Comment on lines
+47
to
+48
| } | ||
| else { |
There was a problem hiding this comment.
Nit: we put them on the same line
Suggested change
| } | |
| else { | |
| } else { |
| @@ -33,14 +33,21 @@ | |||
| ## General configuration | |||
| $ca_server = $puppet::ca_server | |||
| $ca_port = $puppet::ca_port | |||
| $server_node_terminus = $puppet::server::node_terminus | |||
| $server_external_nodes = $puppet::server::external_nodes | |||
| $server_environment_timeout = $puppet::server::environment_timeout | |||
| $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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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.