confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Packages Wiki Activity

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

Browse Source 
Auto-merge for build 96

See merge request puppet/puppet_cd!92
This commit is contained in:
Jenkins
2025-10-30 13:52:00 +00:00
parent 2ad8d87b4b 908ab10c3d
commit c4665ca34f
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
View File

@@ -118,7 +118,14 @@
20 20
21 21
22 22
23</pre> 23
24
25
26
27
28
29
30</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -126,8 +133,15 @@
class puppet_cd::main::install ( class puppet_cd::main::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
package { $pt_agent_pkg: if $fqdn != $pt_pm_fqdn {
ensure =&gt; $pt_pkg_ensure, package { $pt_agent_pkg:
ensure =&gt; $pt_pkg_ensure,
}
if $pt_use_puppetdb == true {
package { $pt_puppetdb_pkg:
ensure =&gt; $pt_pkg_ensure,
}
}
} }
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {

11
manifests/main/install.pp
View File

@@ -6,8 +6,15 @@
class puppet_cd::main::install ( class puppet_cd::main::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
package { $pt_agent_pkg: if $fqdn != $pt_pm_fqdn {
ensure => $pt_pkg_ensure, package { $pt_agent_pkg:
ensure => $pt_pkg_ensure,
}
if $pt_use_puppetdb == true {
package { $pt_puppetdb_pkg:
ensure => $pt_pkg_ensure,
}
}
} }
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {