From 6ac1224fdbb72f3739551b1d1cd0618acd7c1386 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 21 Oct 2025 22:00:11 +0200 Subject: [PATCH 1/2] add r10k - temp change - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/286 --- manifests/params.pp | 2 +- manifests/r10k/install.pp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 6169c7f..67f300b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -94,7 +94,7 @@ class puppet_cd::params ( String $pt_agent_pkg = 'puppet-agent', String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], - Array $pt_r10k_pkg = ['ruby','ruby-devel'], + Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], # user settings ## puppet user diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp index efab7e6..48c8f28 100644 --- a/manifests/r10k/install.pp +++ b/manifests/r10k/install.pp @@ -8,24 +8,24 @@ class puppet_cd::r10k::install ( ) inherits puppet_cd::params { # 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, - before => Exec['enable_crb'], - } - - # enable CRB and install development_tools + # enable CRB exec { 'enable_crb': command => 'dnf config-manager --set-enabled crb', unless => 'dnf repolist --disabled | grep -qE "crb|CodeReady"', - path => ['/usr/bin', '/bin', '/usr/sbin', '/sbin'], + path => ['/usr/bin', '/bin'], + } + + # install required packages + package { $pt_r10k_pkg: + ensure => $pt_pkg_ensure, + before => Package['r10k'], + require => Exec['enable_crb'], } # install r10k via gem package { 'r10k': ensure => $pt_pkg_ensure, provider => gem, - require Exec['enable_crb'], } # configure r10k.yaml From d07655c7a566c91f20248bbeb0b3c1ed4cef8e5a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 22:01:38 +0200 Subject: [PATCH 2/2] Recommit for updates in build 7 --- doc/_index.html | 5 +++++ doc/puppet_class_list.html | 11 ++++++++-- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 6 +++-- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 22 ++++++++++++++++--- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/doc/_index.html b/doc/_index.html index 32a917b..c6d58a4 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,11 @@ +
  • + puppet_cd::r10k::install + +
    • +
  • puppet_cd::r10k::webhook diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 42e1315..a1f97c5 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -113,14 +113,21 @@
    • -
  • +
  • +
    + puppet_cd::r10k::install +
    +
    • + + +
  • puppet_cd::r10k::webhook
    • -
  • +
  • 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 29163d4..4fd74ab 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::r10k::webhook
    puppet_cd::puppetdb::dirs
    @@ -252,7 +254,7 @@ (Array) - (defaults to: ['ruby','ruby-devel']) + (defaults to: ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build']) — @@ -1662,7 +1664,7 @@ class puppet_cd::params ( String $pt_agent_pkg = 'puppet-agent', String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], - Array $pt_r10k_pkg = ['ruby','ruby-devel'], + Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], # user settings ## puppet user 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 e0ea45a..1062bd8 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -131,7 +131,15 @@ 33 34 35 -36 +36 +37 +38 +39 +40 +41 +42 +43 +44 
    # File 'manifests/r10k/install.pp', line 6
@@ -141,10 +149,18 @@ class puppet_cd::r10k::install (
 ) inherits puppet_cd::params {
 #  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
   if $pt_use_r10k == true {
+    # enable CRB
+    exec { 'enable_crb':
+      command => 'dnf config-manager --set-enabled crb',
+      unless  => 'dnf repolist --disabled | grep -qE "crb|CodeReady"',
+      path    => ['/usr/bin', '/bin'],
+    }
+
     # install required packages
     package { $pt_r10k_pkg:
-      ensure => $pt_pkg_ensure,
-      before => Package['r10k'],
+      ensure  => $pt_pkg_ensure,
+      before  => Package['r10k'],
+      require => Exec['enable_crb'],
     }
 
     # install r10k via gem