Recommit for updates in build 21
This commit is contained in:
@@ -1670,17 +1670,7 @@
|
||||
238
|
||||
239
|
||||
240
|
||||
241
|
||||
242
|
||||
243
|
||||
244
|
||||
245
|
||||
246
|
||||
247
|
||||
248
|
||||
249
|
||||
250
|
||||
251</pre>
|
||||
241</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
|
||||
@@ -1801,9 +1791,6 @@ class puppet_cd::params (
|
||||
$pt_puppetdb_ssl = "${pt_puppetdb_main}/ssl"
|
||||
$pt_puppetdb_log = '/var/log/puppetlabs/puppetdb'
|
||||
$pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb'
|
||||
## r10k
|
||||
$pt_r10k_dir = "${pt_main_dir}/r10k"
|
||||
$pt_r10k_webhook_dir = '/etc/r10k-webhook'
|
||||
|
||||
# files
|
||||
## puppet
|
||||
@@ -1830,14 +1817,7 @@ class puppet_cd::params (
|
||||
$pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini"
|
||||
$pt_puppetdb_repl_erb = 'puppet_cd/puppetdb/repl.ini.erb'
|
||||
## r10k
|
||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
|
||||
$pt_r10k_webhook_file = "${pt_r10k_webhook_dir}/webhook_server.py"
|
||||
$pt_r10k_webhook_erb = 'puppet_cd/r10k/webhook.py.erb'
|
||||
$pt_r10k_req_file = "${pt_r10k_webhook_dir}/requirements.txt"
|
||||
$pt_r10k_req_erb = 'puppet_cd/r10k/requirements.txt.erb'
|
||||
$pt_r10k_wh_config_file = "${pt_r10k_webhook_dir}/config.json"
|
||||
$pt_r10k_wh_config_erb = 'puppet_cd/r10k/r10k_webhook_config.erb'
|
||||
$pt_r10k_hook_file = '/usr/local/bin/webhook'
|
||||
|
||||
# service
|
||||
$pt_server_service = 'puppetserver'
|
||||
|
||||
Reference in New Issue
Block a user