-
Notifications
You must be signed in to change notification settings - Fork 93
ssldir from puppet agent #197
base: develop
Are you sure you want to change the base?
ssldir from puppet agent #197
Conversation
This commit implies that PR #196 is accepted. |
$puppetssldir = $::i2_puppet_ssldir | ||
} | ||
else { | ||
$puppetssldir = $::settings::ssldir |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a poor default here because it will retrieve the master's ssldir, and not the agents. This would only work in an environment where the master and the agent are the same operating system. This should be at least overridable by the user as a parameter on a class, which is not possible given the current implementation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix in this is actually what you describe, it will use the agents
ssldir. Currently it does not use it, it uses the masters ssldir!
On 25 April 2016 at 04:01, Zach Leslie [email protected] wrote:
In manifests/params.pp
voxpupuli/puppet-icinga2#197 (comment):
- if $::icinga2::varprefix {
$varprefix = $ ::icinga2::varprefix- }
- elsif $::icinga2::dirprefix {
$varprefix = "$ {::icinga2::dirprefix}/var"- }
- else {
- $varprefix = '/var'
- }
- if $::i2_puppet_ssldir {
$puppetssldir = $ ::i2_puppet_ssldir- }
- else {
$puppetssldir = $ ::settings::ssldirThis is a poor default here because it will retrieve the master's ssldir,
and not the agents. This would only work in an environment where the master
and the agent are the same operating system. This should be at least
overridable by the user as a parameter on a class, which is not possible
given the current implementation.—
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
https://github.com/Icinga/puppet-icinga2/pull/197/files/72b080952e942cf740863127e7ddddc841a2ef41#r60857430
d478ec4
to
fe838de
Compare
Will update this as often as I can based on the updates to PR 196, for now I need at least one more fix to 196 before this will be updated again. |
a626770
to
d11ae57
Compare
d11ae57
to
c7baa60
Compare
👍 also tested in my environment. Thank you. |
c7baa60
to
18d4478
Compare
Rebased |
This fixes the dependence on having the same puppet version (3 vs 4) on all agents AND puppetserver.
With this you can have legacy agents (3.7 that I have tested) with puppetserver 4.x.