From fbeeb7a752125dfe3bee6fe9fa2901df78494229 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Oct 2025 21:00:45 +0200 Subject: [PATCH] Recommit for updates in build 4 --- doc/_index.html | 10 + doc/puppet_class_list.html | 14 ++ .../puppet_cd_3A_3Amain_3A_3Aconfig.html | 12 +- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 211 +++++++++++++++--- .../puppet_cd_3A_3Ar10k_3A_3Ainstall.html | 180 +++++++++++++++ .../puppet_cd_3A_3Ar10k_3A_3Awebhook.html | 130 +++++++++++ 6 files changed, 521 insertions(+), 36 deletions(-) create mode 100644 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html create mode 100644 doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html diff --git a/doc/_index.html b/doc/_index.html index 45d5572..c6d58a4 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,16 @@ +
  • + puppet_cd::r10k::install + +
    • + +
  • + puppet_cd::r10k::webhook + +
    • +
  • puppet_cd::server::service diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index c88fef2..a1f97c5 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -113,6 +113,20 @@
    • +
  • +
    + puppet_cd::r10k::install +
    +
    • + + +
  • +
    + puppet_cd::r10k::webhook +
    +
    • + +
  • puppet_cd::server::service diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html index f5529a7..00f8d54 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html @@ -109,7 +109,12 @@ 11 12 13 -14 +14 +15 +16 +17 +18 +19 
    # File 'manifests/main/config.pp', line 6
@@ -122,6 +127,11 @@ class puppet_cd::main::config (
   if $pt_use_puppetdb == true {
     include puppet_cd::puppetdb::service
   }
+
+  if $pt_use_r10k == true {
+    include puppet_cd::r10k::install
+    include puppet_cd::r10k::webhook
+  }
 }
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 5e9ccf1..19a3b91 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -77,6 +77,10 @@ puppet_cd::main::install
    + puppet_cd::r10k::install
    + + puppet_cd::r10k::webhook
    + puppet_cd::puppetdb::dirs
    puppet_cd::puppetdb::files
    @@ -242,6 +246,24 @@
    • +
  • + + pt_r10k_pkg + + + (Array) + + + (defaults to: ['ruby','ruby-devel']) + + + — +
    +

    the packages for r10k to install

    +
    + +
    • +
  • pt_no_ssl_port @@ -296,24 +318,6 @@
    • -
  • - - pt_manage_user - - - (Boolean) - - - (defaults to: true) - - - — -
    -

    whether to manage the puppet user

    -
    - -
    • -
  • pt_user @@ -1376,6 +1380,109 @@
    • +
  • + + pt_use_r10k + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use r10k service

    +
    + +
    • + +
  • + + pt_use_r10k_webhook + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    whether to use r10k webhook service

    +
    + +
    • + +
  • + + pt_r10k_remote + + + (String) + + + (defaults to: 'git@gitlab.example.net/repo.git') + + + — +
    +

    the remote url for the r10k control repo

    +
    + +
    • + +
  • + + pt_r10k_prefix + + + (Boolean) + + + (defaults to: false) + + + — +
    +

    the r10k prefix. defaults to false

    +
    + +
    • + +
  • + + pt_r10k_basedir + + + (String) + + + (defaults to: '/etc/puppetlabs/code/environments') + + + — +
    +

    the base directory for r10k.yaml

    +
    + +
    • + +
  • + + pt_manage_user + + + (Boolean) + + + (defaults to: true) + + +
    • + @@ -1387,11 +1494,6 @@ 
     
 
-81
-82
-83
-84
-85
 86
 87
 88
@@ -1524,10 +1626,32 @@
 215
 216
 217
-218
    +218 +219 +220 +221 +222 +223 +224 +225 +226 +227 +228 +229 +230 +231 +232 +233 +234 +235 +236 +237 +238 +239 +240 - 
    # File 'manifests/params.pp', line 81
+        
    # File 'manifests/params.pp', line 86
 
 class puppet_cd::params (
 
@@ -1540,6 +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'],
 
   # user settings
   ## puppet user
@@ -1583,7 +1708,7 @@ class puppet_cd::params (
   String $pt_storeconfigs_backend   = 'puppetdb',
   String $pt_parser                 = 'current',
   Boolean $pt_cert_revocation       = true,
-## puppetdb
+  ## puppetdb
   Boolean $pt_use_puppetdb          = false,
   String $pt_logging_max_file_size  = '200MB',
   String $pt_logging_max_history     = '90',
@@ -1611,8 +1736,19 @@ class puppet_cd::params (
   String $pt_repl_port              = '8082',
   String $pt_repl_host              = '127.0.0.1',
 
+# r10k
+  Boolean $pt_use_r10k              = false,
+  Boolean $pt_use_r10k_webhook      = false,
+  String $pt_r10k_remote            = 'git@gitlab.example.net/repo.git',
+  Boolean $pt_r10k_prefix           = false,
+  String $pt_r10k_basedir           = '/etc/puppetlabs/code/environments',
+
 ) {
-  $fqdn                             = $facts['networking']['fqdn']
+# facts
+  $fqdn                   = $facts['networking']['fqdn']
+  $domain                 = $facts['networking']['domain']
+  $os_name                = $facts['os']['name']
+  $os_release             = $facts['os']['release']['major']
 
 # directories
 ## puppet
@@ -1632,6 +1768,8 @@ class puppet_cd::params (
   $pt_puppetdb_ssl                  = "${pt_puppetdb_main}/ssl"
   $pt_puppetdb_log                  = '/var/log/puppetlabs/puppetdb'
   $pt_puppetdb_var_dir              = '/opt/puppetlabs/server/data/puppetdb'
+## r10k
+  $pt_r10k_dir                      = "${pt_main_dir}/r10k"
 
 # files
 ## puppet
@@ -1641,22 +1779,25 @@ class puppet_cd::params (
   $pt_hiera_config                  = "${pt_puppetdir}/hiera.yaml"
 ## puppetdb
   $pt_bootstrap_conf                = "${pt_puppetdb_main}/bootstrap.cfg"
-  $pt_bootstrap_erb                 = 'cd_puppet/puppetdb/bootstrap.cfg.erb'
+  $pt_bootstrap_erb                 = 'puppet_cd/puppetdb/bootstrap.cfg.erb'
   $pt_puppetdb_access_log           = "${pt_puppetdb_log}/puppetdb-access"
   $pt_request_logging_conf          = "${pt_puppetdb_main}/request-logging.xml"
-  $pt_request_logging_erb           = 'cd_puppet/puppetdb/request_logging.xml.erb'
+  $pt_request_logging_erb           = 'puppet_cd/puppetdb/request_logging.xml.erb'
   $pt_logback_conf                  = "${pt_puppetdb_main}/logback.xml"
-  $pt_logback_erb                   = 'cd_puppet/puppetdb/logback.xml.erb'
+  $pt_logback_erb                   = 'puppet_cd/puppetdb/logback.xml.erb'
   $pt_puppetdb_config_ini           = "${pt_puppetdb_conf_d}/config.ini"
-  $pt_puppetdb_config_erb           = 'cd_puppet/puppetdb/config.ini.erb'
+  $pt_puppetdb_config_erb           = 'puppet_cd/puppetdb/config.ini.erb'
   $pt_puppetdb_database_ini         = "${pt_puppetdb_conf_d}/database.ini"
-  $pt_puppetdb_database_erb         = 'cd_puppet/puppetdb/database.ini.erb'
+  $pt_puppetdb_database_erb         = 'puppet_cd/puppetdb/database.ini.erb'
   $pt_puppetdb_jetty_ini            = "${pt_puppetdb_conf_d}/jetty.ini"
-  $pt_puppetdb_jetty_erb            = 'cd_puppet/puppetdb/jetty.ini.erb'
+  $pt_puppetdb_jetty_erb            = 'puppet_cd/puppetdb/jetty.ini.erb'
   $pt_puppetdb_conf_file            = "${pt_puppetdir}/puppetdb.conf"
-  $pt_puppetdb_conf_erb             = 'cd_puppet/puppetdb/puppetdb.conf.erb'
+  $pt_puppetdb_conf_erb             = 'puppet_cd/puppetdb/puppetdb.conf.erb'
   $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
-  $pt_puppetdb_repl_erb             = 'cd_puppet/puppetdb/repl.ini.erb'
+  $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
+## r10k
+  $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
+  $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
 
 # service
   $pt_server_service                = 'puppetserver'
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
new file mode 100644
index 0000000..53e6fbb
--- /dev/null
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -0,0 +1,180 @@
+
+
+  
+    
+
+
+  Puppet Class: puppet_cd::r10k::install
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: puppet_cd::r10k::install
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    puppet_cd::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/r10k/install.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages r10k installation for the puppet_cd module.
+
+
    Overview
    
+
    
+  
    
+    
+
    puppet_cd::r10k::install.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)
    
+
+  
    
+
    
+
+
+
+
    
+  
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
    
+          		
+        
    # File 'manifests/r10k/install.pp', line 6
+
+class puppet_cd::r10k::install (
+
+) inherits puppet_cd::params {
+  if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
+    # install required packages
+    package { $pt_r10k_pkg:
+      ensure => $pt_pkg_ensure,
+      before => Package['r10k'],
+    }
+
+    # install r10k via gem
+    package { 'r10k':
+      ensure   => $pt_pkg_ensure,
+      provider => gem,
+    }
+
+    # configure r10k.yaml
+    file { $pt_r10k_file:
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0440',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => unconfined_u,
+      content  => template($pt_r10k_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
new file mode 100644
index 0000000..632e8d4
--- /dev/null
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html
@@ -0,0 +1,130 @@
+
+
+  
+    
+
+
+  Puppet Class: puppet_cd::r10k::webhook
+  
+    — Documentation by YARD 0.9.36
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: puppet_cd::r10k::webhook
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    puppet_cd::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/r10k/webhook.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages r10k webhook settings for the puppet_cd module.
+
+
    Overview
    
+
    
+  
    
+    
+
    puppet_cd::r10k::webhook.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)
    
+
+  
    
+
    
+
+
+
+
    
+  
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+6
+7
+8
+9
+10
    
+          		
+        
    # File 'manifests/r10k/webhook.pp', line 6
+
+class puppet_cd::r10k::webhook (
+
+) inherits puppet_cd::params {
+
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file