From 7f8a95a0785b4adf5dea41952c3227640831d625 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 21 Oct 2025 22:21:08 +0200 Subject: [PATCH 1/2] add r10k - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/286 --- manifests/r10k/install.pp | 3 +-- templates/r10k/r10k.yaml.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index aecc01e..aed9faa 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -6,8 +6,7 @@ class puppet_cd::r10k::install ( ) inherits puppet_cd::params { -# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { - if $pt_use_r10k == true { + if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) { # enable CRB exec { 'enable_crb': command => 'dnf config-manager --set-enabled crb', diff --git a/templates/r10k/r10k.yaml.erb b/templates/r10k/r10k.yaml.erb index 9b0b77d..d39fb82 100644 --- a/templates/r10k/r10k.yaml.erb +++ b/templates/r10k/r10k.yaml.erb @@ -3,5 +3,5 @@ :sources: :puppet: remote: <%= @pt_r10k_remote %> - prefix: <&= @pt_r10k_prefix %> + prefix: <%= @pt_r10k_prefix %> basedir: '<%= @pt_r10k_basedir %>' From 7ff0fca4a0774b78c830431938c0230ce4bed56a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 22:22:32 +0200 Subject: [PATCH 2/2] Recommit for updates in build 9 --- doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 ++---- 1 file changed, 2 insertions(+), 4 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 4ee4fd1..ae245f6 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -152,8 +152,7 @@ 54 55 56 -57 -58 +57
# File 'manifests/r10k/install.pp', line 6
@@ -161,8 +160,7 @@
 class puppet_cd::r10k::install (
 
 ) inherits puppet_cd::params {
-#  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
-  if $pt_use_r10k == true {
+  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
     # enable CRB
     exec { 'enable_crb':
       command => 'dnf config-manager --set-enabled crb',