Skip to content
This repository has been archived by the owner on Apr 16, 2018. It is now read-only.

ssldir from puppet agent #197

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

TheFlyingCorpse
Copy link
Contributor

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.

@TheFlyingCorpse
Copy link
Contributor Author

This commit implies that PR #196 is accepted.

$puppetssldir = $::i2_puppet_ssldir
}
else {
$puppetssldir = $::settings::ssldir
Copy link
Contributor

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.

Copy link
Contributor Author

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::ssldir

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.


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

@TheFlyingCorpse TheFlyingCorpse force-pushed the feature/ssldir-from-puppet-env branch 3 times, most recently from d478ec4 to fe838de Compare April 26, 2016 19:00
@TheFlyingCorpse
Copy link
Contributor Author

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.

@TheFlyingCorpse TheFlyingCorpse force-pushed the feature/ssldir-from-puppet-env branch 2 times, most recently from a626770 to d11ae57 Compare May 6, 2016 20:08
@TheFlyingCorpse TheFlyingCorpse force-pushed the feature/ssldir-from-puppet-env branch from d11ae57 to c7baa60 Compare May 8, 2016 20:34
@Reamer
Copy link
Contributor

Reamer commented Jun 4, 2016

👍 also tested in my environment. Thank you.

@TheFlyingCorpse TheFlyingCorpse force-pushed the feature/ssldir-from-puppet-env branch from c7baa60 to 18d4478 Compare July 23, 2016 15:07
@TheFlyingCorpse
Copy link
Contributor Author

Rebased

Reamer referenced this pull request in voxpupuli/puppet-icinga2 Sep 27, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants