From f10276e962333f6382ab45d8d90143b553323c46 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 21 Oct 2025 21:10:13 +0200 Subject: [PATCH 1/2] add r10k - temp change - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/286 --- manifests/r10k/install.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index 8ce10c7..9d0a659 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -6,7 +6,8 @@ class puppet_cd::r10k::install ( ) inherits puppet_cd::params { - if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { +# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { + if $pt_use_r10k == true { # install required packages package { $pt_r10k_pkg: ensure => $pt_pkg_ensure, From 920ff4573eb5cda43ba927771a5f7e4e5ab9f009 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 21:11:35 +0200 Subject: [PATCH 2/2] Recommit for updates in build 5 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html index 53e6fbb..e0ea45a 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -130,7 +130,8 @@ 32 33 34 -35 +35 +36
# File 'manifests/r10k/install.pp', line 6
@@ -138,7 +139,8 @@
 class puppet_cd::r10k::install (
 
 ) inherits puppet_cd::params {
-  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+#  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+  if $pt_use_r10k == true {
     # install required packages
     package { $pt_r10k_pkg:
       ensure => $pt_pkg_ensure,