From 164845746b8cbf161918f1f729575f29980ac1d8 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 30 Oct 2025 14:46:44 +0100 Subject: [PATCH 1/2] add puppetdb-termini to all clients - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/292 --- manifests/main/install.pp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/manifests/main/install.pp b/manifests/main/install.pp index 3a15b99..dc850fb 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -6,8 +6,15 @@ class puppet_cd::main::install ( ) inherits puppet_cd::params { - package { $pt_agent_pkg: - ensure => $pt_pkg_ensure, + if $fqdn != $pt_pm_fqdn { + package { $pt_agent_pkg: + ensure => $pt_pkg_ensure, + } + if $pt_use_puppetdb == true { + package { $pt_puppetdb_pkg: + ensure => $pt_pkg_ensure, + } + } } if $fqdn == $pt_pm_fqdn { From 908ab10c3d39f593d5eb0937f1a187b358b2e36e Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 30 Oct 2025 14:48:14 +0100 Subject: [PATCH 2/2] Recommit for updates in build 96 --- .../puppet_cd_3A_3Amain_3A_3Ainstall.html | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html index 21ca0be..5009249 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html @@ -118,7 +118,14 @@ 20 21 22 -23 +23 +24 +25 +26 +27 +28 +29 +30
# File 'manifests/main/install.pp', line 6
@@ -126,8 +133,15 @@
 class puppet_cd::main::install (
 
 ) inherits puppet_cd::params {
-  package { $pt_agent_pkg:
-    ensure => $pt_pkg_ensure,
+  if $fqdn != $pt_pm_fqdn {
+    package { $pt_agent_pkg:
+      ensure => $pt_pkg_ensure,
+    }
+    if $pt_use_puppetdb == true {
+      package { $pt_puppetdb_pkg:
+        ensure => $pt_pkg_ensure,
+      }
+    }
   }
 
   if $fqdn == $pt_pm_fqdn {