3
0

Recommit for updates in build 7

This commit is contained in:
2025-10-21 22:01:38 +02:00
parent b2a3049c03
commit d07655c7a5
4 changed files with 37 additions and 7 deletions

View File

@@ -123,6 +123,11 @@
</li> </li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
</li>
<li> <li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>

View File

@@ -113,14 +113,21 @@
</li> </li>
<li id="object_puppet_classes::puppet_cd::r10k::webhook" class="even"> <li id="object_puppet_classes::puppet_cd::r10k::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::r10k::webhook" class="odd">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span>
</div> </div>
</li> </li>
<li id="object_puppet_classes::puppet_cd::server::service" class="odd"> <li id="object_puppet_classes::puppet_cd::server::service" class="even">
<div class="item"> <div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span> <span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span>
</div> </div>

View File

@@ -77,6 +77,8 @@
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Ainstall.html" title="puppet_classes::puppet_cd::r10k::install (puppet_class)">puppet_cd::r10k::install</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/>
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/> <span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/>
@@ -252,7 +254,7 @@
<span class='type'>(<tt>Array</tt>)</span> <span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;]</tt>)</em> <em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;]</tt>)</em>
&mdash; &mdash;
@@ -1662,7 +1664,7 @@ class puppet_cd::params (
String $pt_agent_pkg = &#39;puppet-agent&#39;, String $pt_agent_pkg = &#39;puppet-agent&#39;,
String $pt_server_pkg = &#39;puppetserver&#39;, String $pt_server_pkg = &#39;puppetserver&#39;,
Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;], Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;], Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#39;],
# user settings # user settings
## puppet user ## puppet user

View File

@@ -131,7 +131,15 @@
33 33
34 34
35 35
36</pre> 36
37
38
39
40
41
42
43
44</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
@@ -141,10 +149,18 @@ class puppet_cd::r10k::install (
) inherits puppet_cd::params { ) 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 { if $pt_use_r10k == true {
# enable CRB
exec { &#39;enable_crb&#39;:
command =&gt; &#39;dnf config-manager --set-enabled crb&#39;,
unless =&gt; &#39;dnf repolist --disabled | grep -qE &quot;crb|CodeReady&quot;&#39;,
path =&gt; [&#39;/usr/bin&#39;, &#39;/bin&#39;],
}
# install required packages # install required packages
package { $pt_r10k_pkg: package { $pt_r10k_pkg:
ensure =&gt; $pt_pkg_ensure, ensure =&gt; $pt_pkg_ensure,
before =&gt; Package[&#39;r10k&#39;], before =&gt; Package[&#39;r10k&#39;],
require =&gt; Exec[&#39;enable_crb&#39;],
} }
# install r10k via gem # install r10k via gem