Recommit for updates in build 58
This commit is contained in:
@@ -87,8 +87,6 @@
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Aservice.html" title="puppet_classes::puppet_cd::puppetdb::service (puppet_class)">puppet_cd::puppetdb::service</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span><br/>
|
||||
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
@@ -252,7 +250,7 @@
|
||||
<span class='type'>(<tt>Array</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build']</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>['ruby','ruby-devel','rubygems','gcc','make']</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1473,10 +1471,10 @@
|
||||
<span class='name'>pt_r10k_webhook_pkg</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
<span class='type'>(<tt>Array</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'/tmp/webhook-go.rpm'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>['webrick', 'r10k_gitlab_webhook']</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1500,6 +1498,24 @@
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to manage the puppet user</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_r10k_webhook_port</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'8080'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the port for the webhook listener</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -1515,7 +1531,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
@@ -1672,10 +1687,15 @@
|
||||
242
|
||||
243
|
||||
244
|
||||
245</pre>
|
||||
245
|
||||
246
|
||||
247
|
||||
248
|
||||
249
|
||||
250</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 89</span>
|
||||
|
||||
class puppet_cd::params (
|
||||
|
||||
@@ -1688,8 +1708,8 @@ class puppet_cd::params (
|
||||
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','gcc','make','redhat-rpm-config','rpm-build'],
|
||||
String $pt_r10k_webhook_pkg = '/tmp/webhook-go.rpm',
|
||||
Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
|
||||
Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'],
|
||||
|
||||
# user settings
|
||||
## puppet user
|
||||
@@ -1767,6 +1787,7 @@ class puppet_cd::params (
|
||||
String $pt_r10k_remote = 'git@gitlab.example.net/repo.git',
|
||||
Boolean $pt_r10k_prefix = false,
|
||||
String $pt_r10k_basedir = '/etc/puppetlabs/code/environments',
|
||||
String $pt_r10k_webhook_port = '8080',
|
||||
|
||||
) {
|
||||
# facts
|
||||
@@ -1824,12 +1845,15 @@ class puppet_cd::params (
|
||||
## r10k
|
||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
|
||||
$pt_webhook_link = 'ln -sf /usr/local/share/gems/gems/r10k_gitlab_webhook-0.1.3/bin/r10k_gitlab_webhook /usr/bin/'
|
||||
$pt_webhook_service_file = '/etc/systemd/system/r10k_gitlab_webhook.service'
|
||||
$pt_webhook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb'
|
||||
|
||||
# service
|
||||
$pt_server_service = 'puppetserver'
|
||||
$pt_agent_service = 'puppet'
|
||||
$pt_db_service = 'puppetdb'
|
||||
$pt_webhook_service = 'webhook-go.service'
|
||||
$pt_r10k_webhook_service = 'r10k_gitlab_webhook'
|
||||
|
||||
#
|
||||
# includes must be last
|
||||
|
||||
Reference in New Issue
Block a user