Merge branch 'develop' into neoloc/sshsign_hostkeys

site/profiles/manifests/base.pp

@@ -58,7 +58,9 @@ class profiles::base (
     }
 
     # include classes from hiera
-    lookup('hiera_classes', Array[String], 'unique').include
+    $hiera_include = lookup('hiera_include', Array[String], 'unique', [])
+    $hiera_exclude = lookup('hiera_exclude', Array[String], 'unique', [])
+    ($hiera_include - $hiera_exclude).include
 
     # specifc ordering constraints
     Class['profiles::pki::vaultca']

site/profiles/manifests/ntp/server.pp

@@ -35,5 +35,13 @@ class profiles::ntp::server (
         queryhosts => $allowquery,
       }
     }
+
+    file {'/usr/local/bin/check_ntp.sh':
+      ensure  => 'file',
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0755',
+      content => template('profiles/ntp/check_ntp.sh.erb'),
+    }
   }
 }

site/profiles/manifests/puppet/client.pp

@@ -12,6 +12,7 @@ class profiles::puppet::client (
   Integer $runtimeout         = 3600,
   Boolean $show_diff          = true,
   Boolean $usecacheonfailure  = false,
+  Integer $facts_soft_limit   = 4096,
 ) {
 
   # dont manage puppet.conf if this is a puppetmaster

site/profiles/manifests/puppet/server.pp

@@ -28,6 +28,7 @@ class profiles::puppet::server (
   Integer $runinterval            = 1800,
   Integer $runtimeout             = 3600,
   Boolean $show_diff              = true,
+  Integer $facts_soft_limit       = 4096,
 ) {
 
   file { '/etc/puppetlabs/puppet/puppet.conf':
@@ -59,6 +60,7 @@ class profiles::puppet::server (
       'storeconfigs_backend' => $storeconfigs_backend,
       'reports'              => $reports,
       'usecacheonfailure'    => $usecacheonfailure,
+      'facts_soft_limit'     => $facts_soft_limit,
     }),
     notify  => Service['puppetserver'],
   }

site/profiles/templates/ntp/check_ntp.sh.erb

@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+
+# Check if ntpd or chronyd is running
+if pgrep ntpd > /dev/null || pgrep chronyd > /dev/null; then
+  exit 0
+else
+  exit 2
+fi

site/profiles/templates/puppet/client/puppet.conf.erb

@@ -11,3 +11,4 @@ runinterval = <%= @runinterval %>
 runtimeout = <%= @runtimeout %>
 show_diff = <%= @show_diff %>
 usecacheonfailure = <%= @usecacheonfailure %>
+number_of_facts_soft_limit = <%= @facts_soft_limit %>

site/profiles/templates/puppet/server/puppet.conf.epp

@@ -17,6 +17,7 @@ report_server = <%= $report_server %>
 runinterval = <%= $runinterval %>
 runtimeout = <%= $runtimeout %>
 show_diff = <%= $show_diff %>
+number_of_facts_soft_limit = <%= $facts_soft_limit %>
 
 [master]
 node_terminus = <%= $node_terminus %>