confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Projects Wiki Activity

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

Browse Source 
Auto-merge for build 76

See merge request puppet/puppet_cd!72
This commit is contained in:
Jenkins
2025-10-27 16:36:51 +00:00
parent 10d5590284 efed90e084
commit 58c65001e5
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -202,22 +202,6 @@
</li>
<li>
<span class='name'>pt_db_pkg</span>
<span class='type'>(<tt>Array</tt>)</span>
&mdash;
<div class='inline'>
<p>the packages for puppetdb</p>
</div>
</li>
<li>
<span class='name'>pt_r10k_pkg</span>
@@ -949,6 +933,7 @@
<pre class="lines">
54
55
56
57
@@ -1052,11 +1037,10 @@
155
156
157
158
159</pre>
158</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 55</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 54</span>
class puppet_cd::params (
@@ -1067,7 +1051,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_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

3
manifests/params.pp
View File

@@ -8,7 +8,6 @@
# @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_user the puppet user
# @param [String] pt_user_comment the user comment
@@ -61,7 +60,7 @@ class puppet_cd::params (
String $pt_pkg_ensure = 'latest',
String $pt_agent_pkg = 'puppet-agent',
String $pt_server_pkg = 'puppetserver',
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