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

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

Browse Source 
Auto-merge for build 75

See merge request puppet/puppet_cd!71
This commit is contained in:
Jenkins
2025-10-27 16:23:41 +00:00
parent 232082451b 2db8323301
commit 10d5590284
6 changed files with 57 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/_index.html
View File

@@ -93,6 +93,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>

15
doc/puppet_class_list.html
View File

@@ -71,28 +71,35 @@
</li>
<li id="object_puppet_classes::puppet_cd::main::user" class="even">
<li id="object_puppet_classes::puppet_cd::main::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::main::user" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::params" class="odd">
<li id="object_puppet_classes::puppet_cd::params" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
</div>
</li>
<li id="object_puppet_classes::puppet_cd::r10k::install" class="even">
<li id="object_puppet_classes::puppet_cd::r10k::install" class="odd">
<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::server::service" class="odd">
<li id="object_puppet_classes::puppet_cd::server::service" class="even">
<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>
</div>

14
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
View File

@@ -113,13 +113,7 @@
15
16
17
18
19
20
21
22
23
24</pre>
18</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -136,12 +130,6 @@ class puppet_cd::main::install (
ensure =&gt; $pt_pkg_ensure,
}
}
if $fqdn == $pt_db_fqdn {
package { $pt_db_pkg:
ensure =&gt; $pt_pkg_ensure,
}
}
}</pre>
</td>
</tr>

592
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -75,6 +75,8 @@
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</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_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::service</a></span><br/>
@@ -146,22 +148,6 @@
</li>
<li>
<span class='name'>pt_db_fqdn</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the fqdn for the puppetdb host.</p>
</div>
</li>
<li>
<span class='name'>pt_pkg_ensure</span>
@@ -224,8 +210,6 @@
<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'>
@@ -252,54 +236,6 @@
</li>
<li>
<span class='name'>pt_no_ssl_port</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>non-ssl port number for puppetdb</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_port</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>ssl port for puppetdb</p>
</div>
</li>
<li>
<span class='name'>pt_use_ssl_only</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>whether to use ssl only.</p>
</div>
</li>
<li>
<span class='name'>pt_user</span>
@@ -372,102 +308,6 @@
</li>
<li>
<span class='name'>pt_manage_db_user</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>whether to manage the user for puppetdb</p>
</div>
</li>
<li>
<span class='name'>pt_db_user</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the puppetdb user</p>
</div>
</li>
<li>
<span class='name'>pt_db_user_comment</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the user comment for puppetdb user</p>
</div>
</li>
<li>
<span class='name'>pt_db_user_home</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the user home for the puppetdb user</p>
</div>
</li>
<li>
<span class='name'>pt_db_user_shell</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the shell for the puppetdb user</p>
</div>
</li>
<li>
<span class='name'>pt_use_puppetdb</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>whether to use puppetdb on host</p>
</div>
</li>
<li>
<span class='name'>pt_environment</span>
@@ -954,358 +794,6 @@
</li>
<li>
<span class='name'>pt_logging_max_file_size</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>max file size for puppetdb logging</p>
</div>
</li>
<li>
<span class='name'>pt_logging_max_history</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>max logging history</p>
</div>
</li>
<li>
<span class='name'>pt_logging_total_size</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>total size of logging file</p>
</div>
</li>
<li>
<span class='name'>pt_com_proc_threads</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>number of processing threads</p>
</div>
</li>
<li>
<span class='name'>pt_concurrent_writes</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>max concurrent writes</p>
</div>
</li>
<li>
<span class='name'>pt_db_subname</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the db name</p>
</div>
</li>
<li>
<span class='name'>pt_db_username</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the db username</p>
</div>
</li>
<li>
<span class='name'>pt_db_password</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the db password</p>
</div>
</li>
<li>
<span class='name'>pt_gc_interval</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>garbage collection interval (Java)</p>
</div>
</li>
<li>
<span class='name'>pt_log_slow_statements</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>number of seconds before an SQL query is considered “slow.”</p>
</div>
</li>
<li>
<span class='name'>pt_puppetdb_source_lan</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the source lan for puppetdb clients</p>
</div>
</li>
<li>
<span class='name'>pt_soft_write_failure</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>allows the PuppetDB-termini to fail softly if PuppetDB is not accessible for command submission.</p>
</div>
</li>
<li>
<span class='name'>pt_no_ssl_host</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>ip range for non-ssl hosts</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_host</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>ip range for SSL hosts</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_key</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>location of the private key</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_cert</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>location of the ssl cert</p>
</div>
</li>
<li>
<span class='name'>pt_ssl_ca_cert</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>location of the ssl ca cert</p>
</div>
</li>
<li>
<span class='name'>pt_log_access</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>whether to configure log access</p>
</div>
</li>
<li>
<span class='name'>pt_access_log_config</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the location of the access log config</p>
</div>
</li>
<li>
<span class='name'>pt_enable_repl</span>
<span class='type'>(<tt>Boolean</tt>)</span>
&mdash;
<div class='inline'>
<p>whether to allow puppetdb replication</p>
</div>
</li>
<li>
<span class='name'>pt_repl_port</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the replication port</p>
</div>
</li>
<li>
<span class='name'>pt_repl_host</span>
<span class='type'>(<tt>String</tt>)</span>
&mdash;
<div class='inline'>
<p>the replication host</p>
</div>
</li>
<li>
<span class='name'>pt_use_r10k</span>
@@ -1461,6 +949,40 @@
<pre class="lines">
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
@@ -1531,45 +1053,10 @@
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194</pre>
159</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 55</span>
class puppet_cd::params (
@@ -1580,8 +1067,7 @@ class puppet_cd::params (
String $pt_pkg_ensure = &#39;latest&#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;],
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;rubygems&#39;,&#39;gcc&#39;,&#39;make&#39;],
Array $pt_r10k_pkg = [&#39;ruby&#39;,&#39;ruby-devel&#39;,&#39;rubygems&#39;,&#39;gcc&#39;,&#39;make&#39;],
Array $pt_r10k_webhook_pkg = [&#39;webrick&#39;, &#39;r10k_gitlab_webhook&#39;],
# user settings

1
manifests/main/install.pp
View File

@@ -15,5 +15,4 @@ class puppet_cd::main::install (
ensure => $pt_pkg_ensure,
}
}
}
}

37
manifests/params.pp
View File

@@ -5,25 +5,15 @@
# @param [Boolean] pt_manage_fw whether to manage firewall settings
# @param [String] pt_pm_fqdn the fqdn for the puppetmaster and master
# settings are applied. any other fqdn # will be considered a puppet agent.
# @param [String] pt_db_fqdn the fqdn for the puppetdb host.
# @param [String] pt_pkg_ensure valid: "present", "latest", "v1.2.3"
# @param [String] pt_agent_pkg the packages for agents to install
# @param [String] pt_server_pkg the server packages to install
# @param [Array] pt_db_pkg the packages for puppetdb
# @param [Array] pt_r10k_pkg the packages for r10k to install
# @param [String] pt_no_ssl_port non-ssl port number for puppetdb
# @param [String] pt_ssl_port ssl port for puppetdb
# @param [Boolean] pt_use_ssl_only whether to use ssl only.
# @param [String] pt_user the puppet user
# @param [String] pt_user_comment the user comment
# @param [String] pt_user_home the user home
# @param [String] pt_user_shell the user shell
# @param [Boolean] pt_manage_db_user whether to manage the user for puppetdb
# @param [String] pt_db_user the puppetdb user
# @param [String] pt_db_user_comment the user comment for puppetdb user
# @param [String] pt_db_user_home the user home for the puppetdb user
# @param [String] pt_db_user_shell the shell for the puppetdb user
# @param [Boolean] pt_use_puppetdb whether to use puppetdb on host
# @param [String] pt_environment the environment
# @param [Boolean] pt_basemodulepath the base module path
# @param [String] pt_logdir the log directory
@@ -53,30 +43,6 @@
# @param [String] pt_storeconfigs_backend where to store client configs
# @param [String] pt_parser which parser version to use
# @param [Boolean] pt_cert_revocation whether to check for cert revocations
# @param [String] pt_logging_max_file_size max file size for puppetdb logging
# @param [String] pt_logging_max_history max logging history
# @param [String] pt_logging_total_size total size of logging file
# @param [String] pt_com_proc_threads number of processing threads
# @param [String] pt_concurrent_writes max concurrent writes
# @param [String] pt_db_subname the db name
# @param [String] pt_db_username the db username
# @param [String] pt_db_password the db password
# @param [String] pt_gc_interval garbage collection interval (Java)
# @param [String] pt_log_slow_statements number of seconds before an SQL query
# is considered "slow."
# @param [String] pt_puppetdb_source_lan the source lan for puppetdb clients
# @param [Boolean] pt_soft_write_failure allows the PuppetDB-termini to fail
# softly if PuppetDB is not accessible for command submission.
# @param [String] pt_no_ssl_host ip range for non-ssl hosts
# @param [String] pt_ssl_host ip range for SSL hosts
# @param [String] pt_ssl_key location of the private key
# @param [String] pt_ssl_cert location of the ssl cert
# @param [String] pt_ssl_ca_cert location of the ssl ca cert
# @param [Boolean] pt_log_access whether to configure log access
# @param [String] pt_access_log_config the location of the access log config
# @param [Boolean] pt_enable_repl whether to allow puppetdb replication
# @param [String] pt_repl_port the replication port
# @param [String] pt_repl_host the replication host
# @param [Boolean] pt_use_r10k whether to use r10k service
# @param [Boolean] pt_use_r10k_webhook whether to use r10k webhook service
# @param [String] pt_r10k_remote the remote url for the r10k control repo
@@ -95,8 +61,7 @@ class puppet_cd::params (
String $pt_pkg_ensure = 'latest',
String $pt_agent_pkg = 'puppet-agent',
String $pt_server_pkg = 'puppetserver',
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'],
# user settings