confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 16

See merge request puppet/puppet_cd!14
This commit is contained in:
Jenkins
2025-10-23 16:35:00 +00:00
parent 35b9e17afa 7e21247f88
commit 7c33a22be2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
View File

@@ -128,10 +128,10 @@ class puppet_cd::main::config (
include puppet_cd::puppetdb::service include puppet_cd::puppetdb::service
} }
if $pt_use_r10k == true { # if $pt_use_r10k == true {
include puppet_cd::r10k::install # include puppet_cd::r10k::install
include puppet_cd::r10k::webhook # include puppet_cd::r10k::webhook
} # }
}</pre> }</pre>
</td> </td>
</tr> </tr>

8
manifests/main/config.pp
View File

@@ -12,8 +12,8 @@ class puppet_cd::main::config (
include puppet_cd::puppetdb::service include puppet_cd::puppetdb::service
} }
if $pt_use_r10k == true { # if $pt_use_r10k == true {
include puppet_cd::r10k::install # include puppet_cd::r10k::install
include puppet_cd::r10k::webhook # include puppet_cd::r10k::webhook
} # }
} }