Recommit for updates in build 52
This commit is contained in:
@@ -1476,7 +1476,7 @@
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'https://3for.me/jp029'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'/tmp/webhook-go.rpm'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1689,7 +1689,7 @@ class puppet_cd::params (
|
||||
String $pt_server_pkg = 'puppetserver',
|
||||
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
|
||||
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
|
||||
## puppet user
|
||||
|
||||
@@ -157,7 +157,13 @@
|
||||
59
|
||||
60
|
||||
61
|
||||
62</pre>
|
||||
62
|
||||
63
|
||||
64
|
||||
65
|
||||
66
|
||||
67
|
||||
68</pre>
|
||||
</td>
|
||||
<td>
|
||||
<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 => template($pt_r10k_erb),
|
||||
}
|
||||
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:
|
||||
ensure => $pt_pkg_ensure,
|
||||
require => File[$pt_r10k_webhook_pkg]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user