confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Auto-merge for build 97

See merge request puppet/puppet_cd!93
This commit is contained in:
Jenkins
2025-10-30 14:22:16 +00:00
parent c4665ca34f 3fa51fa84f
commit e4223d38de
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
View File

@@ -120,12 +120,7 @@
22 22
23 23
24 24
25 25</pre>
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>
@@ -137,11 +132,6 @@ class puppet_cd::main::install (
package { $pt_agent_pkg: package { $pt_agent_pkg:
ensure =&gt; $pt_pkg_ensure, 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 {

5
manifests/main/install.pp
View File

@@ -10,11 +10,6 @@ class puppet_cd::main::install (
package { $pt_agent_pkg: package { $pt_agent_pkg:
ensure => $pt_pkg_ensure, 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 {