confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 5

See merge request puppet/puppet_cd!3
This commit is contained in:
Jenkins
2025-10-21 19:12:14 +00:00
parent c621d3a638 920ff4573e
commit 041a8a1288
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
View File

@@ -130,7 +130,8 @@
32
33
34
35</pre>
35
36</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -138,7 +139,8 @@
class puppet_cd::r10k::install (
) inherits puppet_cd::params {
if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
if $pt_use_r10k == true {
# install required packages
package { $pt_r10k_pkg:
ensure =&gt; $pt_pkg_ensure,

3
manifests/r10k/install.pp
View File

@@ -6,7 +6,8 @@
class puppet_cd::r10k::install (
) inherits puppet_cd::params {
if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
# if ($pt_pm_fqdn == $fqdn) and ($pt_use_r10k == true) {
if $pt_use_r10k == true {
# install required packages
package { $pt_r10k_pkg:
ensure => $pt_pkg_ensure,