confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 52

See merge request puppet/puppet_cd!48
This commit is contained in:
Jenkins
2025-10-25 16:58:06 +00:00
parent 9e089b6618 e0b95d779e
commit e0183c6234
6 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/puppet_classes/puppet_cd_3A_3Aparams.html
View File

@@ -1476,7 +1476,7 @@
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;https://3for.me/jp029&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;/tmp/webhook-go.rpm&#39;</tt>)</em>
&mdash; &mdash;
@@ -1689,7 +1689,7 @@ class puppet_cd::params (
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;,&#39;gcc&#39;,&#39;make&#39;,&#39;redhat-rpm-config&#39;,&#39;rpm-build&#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;],
String $pt_r10k_webhook_pkg = &#39;https://3for.me/jp029&#39;, # points to rpm String $pt_r10k_webhook_pkg = &#39;/tmp/webhook-go.rpm&#39;,
# user settings # user settings
## puppet user ## puppet user

14
doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
View File

@@ -157,7 +157,13 @@
59 59
60 60
61 61
62</pre> 62
63
64
65
66
67
68</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>
@@ -213,8 +219,14 @@ class puppet_cd::r10k::install (
content =&gt; template($pt_r10k_erb), content =&gt; template($pt_r10k_erb),
} }
if $pt_use_r10k_webhook == true { if $pt_use_r10k_webhook == true {
file { $pt_r10k_webhook_pkg:
ensure =&gt; file,
source =&gt; &#39;puppet:///modules/puppet_cd/webhook-go.rpm&#39;
}
package { $pt_r10k_webhook_pkg: package { $pt_r10k_webhook_pkg:
ensure =&gt; $pt_pkg_ensure, ensure =&gt; $pt_pkg_ensure,
require =&gt; File[$pt_r10k_webhook_pkg]
} }
} }
} }

BIN
files/webhook
View File

Binary file not shown.

BIN
files/webhook-go.rpm Normal file
View File

Binary file not shown.

2
manifests/params.pp
View File

@@ -97,7 +97,7 @@ class puppet_cd::params (
String $pt_server_pkg = 'puppetserver', String $pt_server_pkg = 'puppetserver',
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
String $pt_r10k_webhook_pkg = 'https://3for.me/jp029', # points to rpm String $pt_r10k_webhook_pkg = '/tmp/webhook-go.rpm',
# user settings # user settings
## puppet user ## puppet user

6
manifests/r10k/install.pp
View File

@@ -54,8 +54,14 @@ class puppet_cd::r10k::install (
content => template($pt_r10k_erb), content => template($pt_r10k_erb),
} }
if $pt_use_r10k_webhook == true { if $pt_use_r10k_webhook == true {
file { $pt_r10k_webhook_pkg:
ensure => file,
source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
}
package { $pt_r10k_webhook_pkg: package { $pt_r10k_webhook_pkg:
ensure => $pt_pkg_ensure, ensure => $pt_pkg_ensure,
require => File[$pt_r10k_webhook_pkg]
} }
} }
} }