From 063c5757afe9dc16d2298ac6c71cc30979fe144b Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 28 Oct 2025 01:40:46 +0100 Subject: [PATCH 1/2] add package to install - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/main/install.pp | 5 +++++ manifests/params.pp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/manifests/main/install.pp b/manifests/main/install.pp index c33c4d2..3a15b99 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -14,5 +14,10 @@ class puppet_cd::main::install ( package { $pt_server_pkg: ensure => $pt_pkg_ensure, } + if $pt_use_puppetdb == true { + package { $pt_puppetdb_pkg: + ensure => $pt_pkg_ensure, + } + } } } diff --git a/manifests/params.pp b/manifests/params.pp index fca0331..47457b3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,6 +10,7 @@ # @param [String] pt_pkg_ensure valid: "present", "latest", "v1.2.3" # @param [String] pt_agent_pkg the packages for agents to install # @param [String] pt_server_pkg the server packages to install +# @param [String] pt_server_pkg the puppetdb packages to install # @param [Array] pt_r10k_pkg the packages for r10k to install # @param [String] pt_user the puppet user # @param [String] pt_user_comment the user comment @@ -65,6 +66,7 @@ class puppet_cd::params ( String $pt_pkg_ensure = 'present', String $pt_agent_pkg = 'puppet-agent', String $pt_server_pkg = 'puppetserver', + String $pt_puppetdb_pkg = 'puppetdb-termini', Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'], Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'], From d80ceb18d5cde194388654c537a0393b7286652b Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 28 Oct 2025 01:42:08 +0100 Subject: [PATCH 2/2] Recommit for updates in build 86 --- .../puppet_cd_3A_3Amain_3A_3Ainstall.html | 12 +++++- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 39 +++++++++++++++++-- 2 files changed, 47 insertions(+), 4 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 4d5211e..21ca0be 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html @@ -113,7 +113,12 @@ 15 16 17 -18 +18 +19 +20 +21 +22 +23
# File 'manifests/main/install.pp', line 6
@@ -129,6 +134,11 @@ class puppet_cd::main::install (
     package { $pt_server_pkg:
       ensure => $pt_pkg_ensure,
     }
+    if $pt_use_puppetdb == true {
+      package { $pt_puppetdb_pkg:
+        ensure => $pt_pkg_ensure,
+      }
+    }
   }
 }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 4a38ea3..3df8afa 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -238,6 +238,24 @@ +
  • + + pt_server_pkg + + + (String) + + + (defaults to: 'puppetserver') + + + — +
    +

    the puppetdb packages to install

    +
    + +
  • +
  • pt_r10k_pkg @@ -976,6 +994,19 @@
  • +
  • + + pt_puppetdb_pkg + + + (String) + + + (defaults to: 'puppetdb-termini') + + +
  • + @@ -987,7 +1018,6 @@
     
     
    -57
     58
     59
     60
    @@ -1097,10 +1127,12 @@
     164
     165
     166
    -167
    +167 +168 +169 -
    # File 'manifests/params.pp', line 57
    +        
    # File 'manifests/params.pp', line 58
     
     class puppet_cd::params (
     
    @@ -1113,6 +1145,7 @@ class puppet_cd::params (
       String $pt_pkg_ensure             = 'present',
       String $pt_agent_pkg              = 'puppet-agent',
       String $pt_server_pkg             = 'puppetserver',
    +  String $pt_puppetdb_pkg           = 'puppetdb-termini',
       Array $pt_r10k_pkg                = ['ruby','ruby-devel','rubygems','gcc','make'],
       Array $pt_r10k_webhook_pkg        = ['webrick', 'r10k_gitlab_webhook'],