3
0

recommit for updates in build 38

This commit is contained in:
2025-02-26 15:38:04 +01:00
parent 764cd53f2e
commit 8daf7a13ac
3 changed files with 153 additions and 30 deletions

View File

@@ -107,17 +107,45 @@
9 9
10 10
11 11
12</pre> 12
13
14
15
16
17
18
19
20
21
22
23
24
25
26</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>
class puppet_cd::main::install ( class puppet_cd::main::install (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
require puppet_cd::main::yumrepo require puppet_cd::main::yumrepo
package { $pt_agent_pkg:
ensure =&gt; $pt_pkg_ensure,
}
if $fqdn == $pt_pm_fqdn {
package { $pt_server_pkg:
ensure =&gt; $pt_pkg_ensure,
}
}
if $fqdn == $pt_db_fqdn {
package { $pt_db_pkg:
ensure =&gt; $pt_pkg_ensure,
}
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -100,7 +100,8 @@
<div class="discussion"> <div class="discussion">
<p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke <p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke
(arne_teuke@confdroid)</p> (arne_teuke@confdroid) settings are applied. any other fqdn # will be
considered a puppet agent.</p>
</div> </div>
</div> </div>
@@ -115,25 +116,53 @@
<span class='name'>pt_manage_fw</span> <span class='name'>pt_manage_fw</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em> <em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage firewall settings</p>
</div>
</li> </li>
<li> <li>
<span class='name'>pt_puppetmaster</span> <span class='name'>pt_pm_fqdn</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em> <em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>the fqdn for the puppetmaster and master</p>
</div>
</li>
<li>
<span class='name'>pt_db_fqdn</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>the fqdn for the puppetdb host.</p>
</div>
</li> </li>
<li> <li>
@@ -141,12 +170,17 @@
<span class='name'>pt_package_url</span> <span class='name'>pt_package_url</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;https://yum.puppet.com/puppet8-release-el-9.noarch.rpm&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;https://yum.puppet.com/puppet8-release-el-9.noarch.rpm&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the url for fetching the repo rpm</p>
</div>
</li> </li>
<li> <li>
@@ -154,12 +188,71 @@
<span class='name'>pt_pkg_ensure</span> <span class='name'>pt_pkg_ensure</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>valid: “present”, “latest”, “v1.2.3”</p>
</div>
</li>
<li>
<span class='name'>pt_agent_pkg</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;puppet-agent&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the packages for agents to install</p>
</div>
</li>
<li>
<span class='name'>pt_server_pkg</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;puppetserver&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the server packages to install</p>
</div>
</li>
<li>
<span class='name'>pt_db_pkg</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;]</tt>)</em>
&mdash;
<div class='inline'>
<p>the packages for puppetdb</p>
</div>
</li> </li>
</ul> </ul>
@@ -173,15 +266,6 @@
<pre class="lines"> <pre class="lines">
6
7
8
9
10
11
12
13
14
15 15
16 16
17 17
@@ -194,32 +278,43 @@
24 24
25 25
26 26
27</pre> 27
28
29
30
31
32
33
34
35
36
37</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 15</span>
class puppet_cd::params ( class puppet_cd::params (
$pt_manage_fw = true, Boolean $pt_manage_fw = true,
$pt_puppetmaster = undef, String $pt_pm_fqdn = undef,
String $pt_db_fqdn = undef,
# installation # installation
$pt_package_url = &#39;https://yum.puppet.com/puppet8-release-el-9.noarch.rpm&#39;, String $pt_package_url = &#39;https://yum.puppet.com/puppet8-release-el-9.noarch.rpm&#39;,
$pt_pkg_ensure = &#39;present&#39;, String $pt_pkg_ensure = &#39;present&#39;,
String $pt_agent_pkg = &#39;puppet-agent&#39;,
String $pt_server_pkg = &#39;puppetserver&#39;,
Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
) { ) {
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
# service # service
$pt_service = &#39;puppetserver&#39; $pt_service = &#39;puppetserver&#39;
# #
# includes must be last # includes must be last
include puppet_cd::main::config include puppet_cd::main::config
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -128,7 +128,7 @@ class puppet_cd::server::service (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
if $fqdn == $pt_puppetmaster { if $fqdn == $pt_pm_fqdn {
require puppet_cd::firewall::iptables require puppet_cd::firewall::iptables
require puppet_cd::main::files require puppet_cd::main::files