Add a fact that resolves correctly to puppet's ssldir and use it.

Author: TheFlyingCorpse

lib/facter/icinga2_puppet_ssldir.rb

@@ -0,0 +1,23 @@
+require 'facter'
+
+# Based on the facter from https://github.com/jhg03a/puppet-agentfacts
+
+# Set the preferred run mode.  This dictates what config sections get loaded.
+# This fixes the issue where you are getting agentfacts from a manual facter -p run
+# and the environment setting is wrong.
+Puppet.settings.preferred_run_mode= :agent
+
+# Pull in puppet settings from global variable
+settings = Puppet.settings.to_h
+
+# Resolve setting values to their bare value instead of the puppet setting class
+pretty_settings = {}
+settings.each do |key, value|
+  if key.to_s == "ssldir"
+    Facter.add("icinga2_puppet_ssldir") do 
+      setcode do
+        result = value.value
+      end
+    end
+  end
+end

manifests/init.pp

@@ -42,6 +42,7 @@
   $sbin_dir                               = $::icinga2::params::sbin_dir,
   $share_dir                              = $::icinga2::params::share_dir,
   $var_dir                                = $::icinga2::params::var_dir,
+  $puppet_ssldir                          = $::icinga2::params::puppet_ssldir,
 ) inherits ::icinga2::params {
   # TODO: temporary parameter until we provide some default templates
   validate_bool($purge_confd)

manifests/params.pp

@@ -132,6 +132,14 @@
     $var_dir = '/var'
   }
 
+  # Use the fact for the local agents ssldir, if it is not found it will use the masters.
+  if $::icinga2_puppet_ssldir {
+    $puppet_ssldir = $::icinga2_puppet_ssldir
+  }
+  else {
+    $puppet_ssldir = $::settings::ssldir
+  }
+
   # the schema is now using a set parameter for the os or the default.
   $db_schema_mysql = "${share_dir}/icinga2-ido-mysql/schema/mysql.sql"
   $db_schema_pgsql = "${share_dir}/icinga2-ido-pgsql/schema/pgsql.sql"

manifests/pki/puppet.pp

@@ -4,13 +4,13 @@
 #
 class icinga2::pki::puppet(
   $ca_path     = "${::icinga2::config_dir}/pki/ca.crt",
-  $ca_source   = "${::settings::ssldir}/certs/ca.pem",
+  $ca_source   = "${::icinga2::puppet_ssldir}/certs/ca.pem",
   $cert_path   = "${::icinga2::config_dir}/pki/${::fqdn}.crt",
-  $cert_source = "${::settings::ssldir}/certs/${::fqdn}.pem",
+  $cert_source = "${::icinga2::puppet_ssldir}/certs/${::fqdn}.pem",
   $key_path    = "${::icinga2::config_dir}/pki/${::fqdn}.key",
-  $key_source  = "${::settings::ssldir}/private_keys/${::fqdn}.pem",
+  $key_source  = "${::icinga2::puppet_ssldir}/private_keys/${::fqdn}.pem",
   $crl_path    = "${::icinga2::config_dir}/pki/crl.pem",
-  $crl_source  = "${::settings::ssldir}/crl.pem",
+  $crl_source  = "${::icinga2::puppet_ssldir}/crl.pem",
 ) {
 
   File {