Adjust Puppet Master and Puppet CA wording and tooltip on Host records #7810
Conversation
|
Can one of the admins verify this patch? |
2 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
theforeman-bot
added
Waiting on contributor
Needs testing
Not yet reviewed
and removed
Waiting on contributor
labels
app/models/concerns/host_common.rb
Outdated
| :label => N_('Puppet Master'), | ||
| :description => N_('Use this puppet server as an initial Puppet Server or to execute puppet runs'), | ||
| :label => N_('Puppetserver Proxy'), | ||
| :description => N_('Use this Smart Proxy to connect to an initial Puppetserver to execute puppet runs'), |
There was a problem hiding this comment.
I'm not sure the initial part is correct. It's also presented in the ENC
There was a problem hiding this comment.
So the value is specifically used by default during provision - correct? which I'm guessing is where the "initial" originally came from. It doesn't force the use of the defined CA proxy / Puppet Proxy either. hm
"Smart Proxy provided to provisioning templates and ENC as the Puppet Server"
... that sounds awkward... I'll drink some more coffee and keep thinking
There was a problem hiding this comment.
Yes, this is hard stuff. Perhaps @melcorr has some good thoughts.
IMHO there are 2 things that are relevant. First of all, there's just the intention. Whenever you want to know which server is responsible, this is the authoritative value. Like a CMDB. Other tools and integrations can read this. One of those would be provisioning, but the ENC also sends it so you can correct it. Ansible / REX could also use it to update. The other side is importing classes. That calls the Smart Proxy which in turn calls the Puppetserver API.
Now to summarize that in a short description ...
There was a problem hiding this comment.
I might be totally off but it might get you thinking:
Enter the Smart Proxy to use for provisioning templates and as the Puppet Server ENC
or
Enter the Smart Proxy to use as both the default Puppet Server for Puppet runs and the Puppet Server ENC
There was a problem hiding this comment.
Enter the default Smart Proxy used to access the Puppetserver API
and
Enter the default Smart Proxy used to access the Puppetserver CA API
There was a problem hiding this comment.
See the latest - let me know if you want me to tweak it anymore - This at least causes me to think/look more and not assume the value I'm picking there is the Server that I want to use, but rather the Smart Proxy... which would when troubleshooting trigger me to look at the Smart Proxy for issues if values aren't correct... So I think this accomplishes the original goal.
app/models/concerns/host_common.rb
Outdated
| :label => N_('Puppet Master'), | ||
| :description => N_('Use this puppet server as an initial Puppet Server or to execute puppet runs'), | ||
| :label => N_('Puppet Proxy'), | ||
| :description => N_('Enter the default Smart Proxy used to access the Puppetserver API'), |
There was a problem hiding this comment.
To me default implies there's a fallback so I'd leave out default.
But thinking more, how about something like:
| :description => N_('Enter the default Smart Proxy used to access the Puppetserver API'), | |
| :description => N_('Use the Puppetserver configured on this Smart Proxy.'), |
There was a problem hiding this comment.
I like that better, adjusted
…lue represents the Smart Proxy whose puppet_url will be used
|
ok to test |
|
[test katello] |
|
@vollmerk although we should probably do something about: https://github.com/theforeman/theforeman.org/search?q=puppet+master+path%3A_includes%2Fmanuals%2Fnightly&unscoped_q=puppet+master+path%3A_includes%2Fmanuals%2Fnightly |
|
@ezr-ondrej yes, I noticed this too. In theforeman/theforeman.org@cbd3af9 I already updated a few but looks like I wasn't thorough enough. |
|
This can go in regardless, I'll open the PR and let's discuss there :) |
Adjust the wording on hosts so that it reflects the value represents the Smart Proxy whose puppet_url will be used, not the FQDN of the Puppet CA or Puppetserver themselves.
Fixes #30351
See - https://community.theforeman.org/t/foreman-provision-template-host-doesnt-have-correct-puppetserver-or-puppetca/19440 for further discussion