From 8daf7a13ac192561579e591789dc5456703f426f Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Wed, 26 Feb 2025 15:38:04 +0100 Subject: [PATCH] recommit for updates in build 38 --- .../puppet_cd_3A_3Amain_3A_3Ainstall.html | 34 +++- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 147 ++++++++++++++---- .../puppet_cd_3A_3Aserver_3A_3Aservice.html | 2 +- 3 files changed, 153 insertions(+), 30 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 899fb46..1aa4ba8 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html @@ -107,17 +107,45 @@ 9 10 11 -12 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 
# File 'manifests/main/install.pp', line 6
 
 class puppet_cd::main::install (
 
-) inherits puppet_cd::params  {
-
+) inherits puppet_cd::params {
   require puppet_cd::main::yumrepo
 
+  package { $pt_agent_pkg:
+    ensure => $pt_pkg_ensure,
+  }
+
+  if $fqdn == $pt_pm_fqdn {
+    package { $pt_server_pkg:
+      ensure => $pt_pkg_ensure,
+    }
+  }
+
+  if $fqdn == $pt_db_fqdn {
+    package { $pt_db_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 80637ef..86ffa19 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -100,7 +100,8 @@

puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke -(arne_teuke@confdroid)

+(arne_teuke@confdroid) settings are applied. any other fqdn # will be +considered a puppet agent.

@@ -115,25 +116,53 @@ pt_manage_fw - (Any) + (Boolean) (defaults to: true) + — +
+

whether to manage firewall settings

+
+
  • - pt_puppetmaster + pt_pm_fqdn - (Any) + (String) (defaults to: undef) + — +
    +

    the fqdn for the puppetmaster and master

    +
    + +
    • + +
  • + + pt_db_fqdn + + + (String) + + + (defaults to: undef) + + + — +
    +

    the fqdn for the puppetdb host.

    +
    +
  • @@ -141,12 +170,17 @@ pt_package_url - (Any) + (String) (defaults to: 'https://yum.puppet.com/puppet8-release-el-9.noarch.rpm') + — +
    +

    the url for fetching the repo rpm

    +
    +
  • @@ -154,12 +188,71 @@ pt_pkg_ensure - (Any) + (String) (defaults to: 'present') + — +
    +

    valid: “present”, “latest”, “v1.2.3”

    +
    + +
    • + +
  • + + pt_agent_pkg + + + (String) + + + (defaults to: 'puppet-agent') + + + — +
    +

    the packages for agents to install

    +
    + +
    • + +
  • + + pt_server_pkg + + + (String) + + + (defaults to: 'puppetserver') + + + — +
    +

    the server packages to install

    +
    + +
    • + +
  • + + pt_db_pkg + + + (Array) + + + (defaults to: ['puppetdb','puppetdb-termini']) + + + — +
    +

    the packages for puppetdb

    +
    +
    • @@ -173,15 +266,6 @@ 
     
 
-6
-7
-8
-9
-10
-11
-12
-13
-14
 15
 16
 17
@@ -194,32 +278,43 @@
 24
 25
 26
-27
    +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 - 
    # File 'manifests/params.pp', line 6
+        
    # File 'manifests/params.pp', line 15
 
 class puppet_cd::params (
 
-  $pt_manage_fw     = true,
-  $pt_puppetmaster  = undef,
+  Boolean $pt_manage_fw     = true,
+  String $pt_pm_fqdn        = undef,
+  String $pt_db_fqdn        = undef,
 
   # installation
-  $pt_package_url   =  'https://yum.puppet.com/puppet8-release-el-9.noarch.rpm',
-  $pt_pkg_ensure    = 'present',
-
+  String $pt_package_url    = 'https://yum.puppet.com/puppet8-release-el-9.noarch.rpm',
+  String $pt_pkg_ensure     = 'present',
+  String $pt_agent_pkg      = 'puppet-agent',
+  String $pt_server_pkg     = 'puppetserver',
+  Array $pt_db_pkg          = ['puppetdb','puppetdb-termini'],
 
 ) {
-
-$fqdn               = $facts['networking']['fqdn']
+  $fqdn                     = $facts['networking']['fqdn']
 
 # service
-$pt_service         = 'puppetserver'
+  $pt_service               = 'puppetserver'
 
 #
   # includes must be last
   include puppet_cd::main::config
-
 }
    
       
     
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index 315746a..b56698b 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -128,7 +128,7 @@ class puppet_cd::server::service (
 
 ) inherits puppet_cd::params  {
 
-  if $fqdn == $pt_puppetmaster {
+  if $fqdn == $pt_pm_fqdn {
 
     require puppet_cd::firewall::iptables
     require puppet_cd::main::files