3
0

Merge branch 'jenkins-build-24' into 'master'

Auto-merge for build 24

See merge request puppet/puppet_cd!21
This commit is contained in:
2025-10-23 18:42:28 +00:00
2 changed files with 1 additions and 19 deletions

View File

@@ -1674,13 +1674,7 @@
242
243
244
245
246
247
248
249
250
251</pre>
245</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
@@ -1831,12 +1825,6 @@ class puppet_cd::params (
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
$pt_r10k_webhook_file = &quot;${pt_r10k_webhook_dir}/webhook_server.py&quot;
$pt_r10k_webhook_erb = &#39;puppet_cd/r10k/webhook.py.erb&#39;
$pt_r10k_req_file = &quot;${pt_r10k_webhook_dir}/requirements.txt&quot;
$pt_r10k_req_erb = &#39;puppet_cd/r10k/requirements.txt.erb&#39;
$pt_r10k_wh_config_file = &quot;${pt_r10k_webhook_dir}/config.json&quot;
$pt_r10k_wh_config_erb = &#39;puppet_cd/r10k/r10k_webhook_config.erb&#39;
$pt_r10k_hook_file = &#39;/usr/local/bin/webhook&#39;
# service

View File

@@ -231,12 +231,6 @@ class puppet_cd::params (
## r10k
$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