3
0

Recommit for updates in build 4

This commit is contained in:
2025-10-21 21:00:45 +02:00
parent fb8d3aaf2b
commit fbeeb7a752
6 changed files with 521 additions and 36 deletions

View File

@@ -77,6 +77,10 @@
<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_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_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span><br/>
@@ -242,6 +246,24 @@
</li>
<li>
<span class='name'>pt_r10k_pkg</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;ruby&#39;,&#39;ruby-devel&#39;]</tt>)</em>
&mdash;
<div class='inline'>
<p>the packages for r10k to install</p>
</div>
</li>
<li>
<span class='name'>pt_no_ssl_port</span>
@@ -296,24 +318,6 @@
</li>
<li>
<span class='name'>pt_manage_user</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage the puppet user</p>
</div>
</li>
<li>
<span class='name'>pt_user</span>
@@ -1376,6 +1380,109 @@
</li>
<li>
<span class='name'>pt_use_r10k</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to use r10k service</p>
</div>
</li>
<li>
<span class='name'>pt_use_r10k_webhook</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to use r10k webhook service</p>
</div>
</li>
<li>
<span class='name'>pt_r10k_remote</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;git@gitlab.example.net/repo.git&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the remote url for the r10k control repo</p>
</div>
</li>
<li>
<span class='name'>pt_r10k_prefix</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>the r10k prefix. defaults to false</p>
</div>
</li>
<li>
<span class='name'>pt_r10k_basedir</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/code/environments&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the base directory for r10k.yaml</p>
</div>
</li>
<li>
<span class='name'>pt_manage_user</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
</li>
</ul>
@@ -1387,11 +1494,6 @@
<pre class="lines">
81
82
83
84
85
86
87
88
@@ -1524,10 +1626,32 @@
215
216
217
218</pre>
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 81</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 86</span>
class puppet_cd::params (
@@ -1540,6 +1664,7 @@ class puppet_cd::params (
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;],
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;],
# user settings
## puppet user
@@ -1583,7 +1708,7 @@ class puppet_cd::params (
String $pt_storeconfigs_backend = &#39;puppetdb&#39;,
String $pt_parser = &#39;current&#39;,
Boolean $pt_cert_revocation = true,
## puppetdb
## puppetdb
Boolean $pt_use_puppetdb = false,
String $pt_logging_max_file_size = &#39;200MB&#39;,
String $pt_logging_max_history = &#39;90&#39;,
@@ -1611,8 +1736,19 @@ class puppet_cd::params (
String $pt_repl_port = &#39;8082&#39;,
String $pt_repl_host = &#39;127.0.0.1&#39;,
# r10k
Boolean $pt_use_r10k = false,
Boolean $pt_use_r10k_webhook = false,
String $pt_r10k_remote = &#39;git@gitlab.example.net/repo.git&#39;,
Boolean $pt_r10k_prefix = false,
String $pt_r10k_basedir = &#39;/etc/puppetlabs/code/environments&#39;,
) {
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
# facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$domain = $facts[&#39;networking&#39;][&#39;domain&#39;]
$os_name = $facts[&#39;os&#39;][&#39;name&#39;]
$os_release = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
# directories
## puppet
@@ -1632,6 +1768,8 @@ class puppet_cd::params (
$pt_puppetdb_ssl = &quot;${pt_puppetdb_main}/ssl&quot;
$pt_puppetdb_log = &#39;/var/log/puppetlabs/puppetdb&#39;
$pt_puppetdb_var_dir = &#39;/opt/puppetlabs/server/data/puppetdb&#39;
## r10k
$pt_r10k_dir = &quot;${pt_main_dir}/r10k&quot;
# files
## puppet
@@ -1641,22 +1779,25 @@ class puppet_cd::params (
$pt_hiera_config = &quot;${pt_puppetdir}/hiera.yaml&quot;
## puppetdb
$pt_bootstrap_conf = &quot;${pt_puppetdb_main}/bootstrap.cfg&quot;
$pt_bootstrap_erb = &#39;cd_puppet/puppetdb/bootstrap.cfg.erb&#39;
$pt_bootstrap_erb = &#39;puppet_cd/puppetdb/bootstrap.cfg.erb&#39;
$pt_puppetdb_access_log = &quot;${pt_puppetdb_log}/puppetdb-access&quot;
$pt_request_logging_conf = &quot;${pt_puppetdb_main}/request-logging.xml&quot;
$pt_request_logging_erb = &#39;cd_puppet/puppetdb/request_logging.xml.erb&#39;
$pt_request_logging_erb = &#39;puppet_cd/puppetdb/request_logging.xml.erb&#39;
$pt_logback_conf = &quot;${pt_puppetdb_main}/logback.xml&quot;
$pt_logback_erb = &#39;cd_puppet/puppetdb/logback.xml.erb&#39;
$pt_logback_erb = &#39;puppet_cd/puppetdb/logback.xml.erb&#39;
$pt_puppetdb_config_ini = &quot;${pt_puppetdb_conf_d}/config.ini&quot;
$pt_puppetdb_config_erb = &#39;cd_puppet/puppetdb/config.ini.erb&#39;
$pt_puppetdb_config_erb = &#39;puppet_cd/puppetdb/config.ini.erb&#39;
$pt_puppetdb_database_ini = &quot;${pt_puppetdb_conf_d}/database.ini&quot;
$pt_puppetdb_database_erb = &#39;cd_puppet/puppetdb/database.ini.erb&#39;
$pt_puppetdb_database_erb = &#39;puppet_cd/puppetdb/database.ini.erb&#39;
$pt_puppetdb_jetty_ini = &quot;${pt_puppetdb_conf_d}/jetty.ini&quot;
$pt_puppetdb_jetty_erb = &#39;cd_puppet/puppetdb/jetty.ini.erb&#39;
$pt_puppetdb_jetty_erb = &#39;puppet_cd/puppetdb/jetty.ini.erb&#39;
$pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot;
$pt_puppetdb_conf_erb = &#39;cd_puppet/puppetdb/puppetdb.conf.erb&#39;
$pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
$pt_puppetdb_repl_ini = &quot;${pt_puppetdb_conf_d}/repl.ini&quot;
$pt_puppetdb_repl_erb = &#39;cd_puppet/puppetdb/repl.ini.erb&#39;
$pt_puppetdb_repl_erb = &#39;puppet_cd/puppetdb/repl.ini.erb&#39;
## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;
$pt_r10k_erb = &#39;puppet_cd/r10k/r10k.yaml.erb&#39;
# service
$pt_server_service = &#39;puppetserver&#39;