From 3d3783373050758a9c74ea2689affa94f709e983 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 23 Oct 2025 20:35:10 +0200 Subject: [PATCH 1/2] re-add variables - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/params.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 6bd67fd..ef03c4a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -229,8 +229,15 @@ class puppet_cd::params ( $pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini" $pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb' ## r10k - $pt_r10k_hook_file = '/usr/local/bin/webhook' + $pt_r10k_file = "${pt_r10k_dir}/r10k.yaml" $pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb' + $pt_r10k_webhook_file = "${pt_r10k_webhook_dir}/webhook_server.py" + $pt_r10k_webhook_erb = 'puppet_cd/r10k/webhook.py.erb' + $pt_r10k_req_file = "${pt_r10k_webhook_dir}/requirements.txt" + $pt_r10k_req_erb = 'puppet_cd/r10k/requirements.txt.erb' + $pt_r10k_wh_config_file = "${pt_r10k_webhook_dir}/config.json" + $pt_r10k_wh_config_erb = 'puppet_cd/r10k/r10k_webhook_config.erb' + $pt_r10k_hook_file = '/usr/local/bin/webhook' # service $pt_server_service = 'puppetserver' From cbcc094564dba29a8dd56bfc34962d4fc5a5b3ef Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 23 Oct 2025 20:36:58 +0200 Subject: [PATCH 2/2] Recommit for updates in build 23 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 2eb2bb9..c2e0427 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1673,7 +1673,14 @@ 241 242 243 -244 +244 +245 +246 +247 +248 +249 +250 +251
# File 'manifests/params.pp', line 88
@@ -1822,8 +1829,15 @@ class puppet_cd::params (
   $pt_puppetdb_repl_ini             = "${pt_puppetdb_conf_d}/repl.ini"
   $pt_puppetdb_repl_erb             = 'puppet_cd/puppetdb/repl.ini.erb'
 ## r10k
-  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
+  $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"
   $pt_r10k_erb                      = 'puppet_cd/r10k/r10k.yaml.erb'
+  $pt_r10k_webhook_file             = "${pt_r10k_webhook_dir}/webhook_server.py"
+  $pt_r10k_webhook_erb              = 'puppet_cd/r10k/webhook.py.erb'
+  $pt_r10k_req_file                 = "${pt_r10k_webhook_dir}/requirements.txt"
+  $pt_r10k_req_erb                  = 'puppet_cd/r10k/requirements.txt.erb'
+  $pt_r10k_wh_config_file           =  "${pt_r10k_webhook_dir}/config.json"
+  $pt_r10k_wh_config_erb            = 'puppet_cd/r10k/r10k_webhook_config.erb'
+  $pt_r10k_hook_file                = '/usr/local/bin/webhook'
 
 # service
   $pt_server_service                = 'puppetserver'