Recommit for updates in build 51
This commit is contained in:
@@ -79,8 +79,6 @@
|
||||
|
||||
<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_3Ar10k_3A_3Awebhook.html" title="puppet_classes::puppet_cd::r10k::webhook (puppet_class)">puppet_cd::r10k::webhook</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span><br/>
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Apuppetdb_3A_3Afiles.html" title="puppet_classes::puppet_cd::puppetdb::files (puppet_class)">puppet_cd::puppetdb::files</a></span><br/>
|
||||
@@ -1478,7 +1476,7 @@
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'python3-pip'</tt>)</em>
|
||||
<em class="default">(defaults to: <tt>'https://3for.me/jp029'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
@@ -1502,24 +1500,6 @@
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to manage the puppet user</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_webhook_secret</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>''</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the secret for the webhook</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -1535,6 +1515,7 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
@@ -1691,16 +1672,10 @@
|
||||
242
|
||||
243
|
||||
244
|
||||
245
|
||||
246
|
||||
247
|
||||
248
|
||||
249
|
||||
250
|
||||
251</pre>
|
||||
245</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 88</span>
|
||||
|
||||
class puppet_cd::params (
|
||||
|
||||
@@ -1714,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 = 'python3-pip',
|
||||
String $pt_r10k_webhook_pkg = 'https://3for.me/jp029', # points to rpm
|
||||
|
||||
# user settings
|
||||
## puppet user
|
||||
@@ -1792,7 +1767,6 @@ 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_webhook_secret = '',
|
||||
|
||||
) {
|
||||
# facts
|
||||
@@ -1850,16 +1824,12 @@ class puppet_cd::params (
|
||||
## r10k
|
||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
|
||||
$pt_r10k_hook_file = '/usr/local/bin/webhook'
|
||||
$pt_r10k_hook_config_file = "${pt_r10k_webhook_dir}/hooks.json"
|
||||
$pt_r10k_hook_config_erb = 'puppet_cd/r10k/hook_config.erb'
|
||||
$pt_r10k_hook_service_file = '/etc/systemd/system/webhook.service'
|
||||
$pt_r10k_hook_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'
|
||||
|
||||
#
|
||||
# includes must be last
|
||||
|
||||
Reference in New Issue
Block a user