From fd42940c4c6dafa97b1d4dc28dce4d3860a971f1 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sat, 25 Oct 2025 19:10:37 +0200 Subject: [PATCH 1/2] add local rpm - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/r10k/install.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index a49f6ce..d3e430c 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -60,8 +60,7 @@ class puppet_cd::r10k::install ( } exec { 'install rpm': - command = "yum install ${pt_r10k_webhook_pkg}", - ensure => $pt_pkg_ensure, + command => "yum install ${pt_r10k_webhook_pkg}", require => File[$pt_r10k_webhook_pkg], } } From d9f8ee0f7d4034dd21724590c1848f184687bcae Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sat, 25 Oct 2025 19:12:13 +0200 Subject: [PATCH 2/2] Recommit for updates in build 54 --- doc/_index.html | 5 +++++ doc/puppet_class_list.html | 9 ++++++++- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 2 ++ doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 6 +++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index 45d5572..d89e6e3 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,11 @@ +
  • + puppet_cd::r10k::install + +
    • +
  • puppet_cd::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index c88fef2..78cd518 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -113,7 +113,14 @@
    • -
  • +
  • +
    + puppet_cd::r10k::install +
    +
    • + + +
  • puppet_cd::server::service
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 63349d0..a7b74eb 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -77,6 +77,8 @@ puppet_cd::main::install
    + puppet_cd::r10k::install
    + puppet_cd::puppetdb::dirs
    puppet_cd::puppetdb::files
    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 1f77e8b..f353ed4 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -224,9 +224,9 @@ class puppet_cd::r10k::install ( source => 'puppet:///modules/puppet_cd/webhook-go.rpm' } - package { $pt_r10k_webhook_pkg: - ensure => $pt_pkg_ensure, - require => File[$pt_r10k_webhook_pkg] + exec { 'install rpm': + command => "yum install ${pt_r10k_webhook_pkg}", + require => File[$pt_r10k_webhook_pkg], } } }