Recommit for updates in build 4
This commit is contained in:
@@ -77,6 +77,10 @@
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span><br/>
|
||||
|
||||
<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/>
|
||||
@@ -242,6 +246,24 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_r10k_pkg</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Array</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>['ruby','ruby-devel']</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the packages for r10k to install</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_no_ssl_port</span>
|
||||
@@ -296,24 +318,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_manage_user</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to manage the puppet user</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_user</span>
|
||||
@@ -1376,6 +1380,109 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_use_r10k</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to use r10k service</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_use_r10k_webhook</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to use r10k webhook service</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_r10k_remote</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'git@gitlab.example.net/repo.git'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the remote url for the r10k control repo</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_r10k_prefix</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the r10k prefix. defaults to false</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_r10k_basedir</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'/etc/puppetlabs/code/environments'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the base directory for r10k.yaml</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_manage_user</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -1387,11 +1494,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
81
|
||||
82
|
||||
83
|
||||
84
|
||||
85
|
||||
86
|
||||
87
|
||||
88
|
||||
@@ -1524,10 +1626,32 @@
|
||||
215
|
||||
216
|
||||
217
|
||||
218</pre>
|
||||
218
|
||||
219
|
||||
220
|
||||
221
|
||||
222
|
||||
223
|
||||
224
|
||||
225
|
||||
226
|
||||
227
|
||||
228
|
||||
229
|
||||
230
|
||||
231
|
||||
232
|
||||
233
|
||||
234
|
||||
235
|
||||
236
|
||||
237
|
||||
238
|
||||
239
|
||||
240</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 81</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 86</span>
|
||||
|
||||
class puppet_cd::params (
|
||||
|
||||
@@ -1540,6 +1664,7 @@ 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'],
|
||||
|
||||
# user settings
|
||||
## puppet user
|
||||
@@ -1583,7 +1708,7 @@ class puppet_cd::params (
|
||||
String $pt_storeconfigs_backend = 'puppetdb',
|
||||
String $pt_parser = 'current',
|
||||
Boolean $pt_cert_revocation = true,
|
||||
## puppetdb
|
||||
## puppetdb
|
||||
Boolean $pt_use_puppetdb = false,
|
||||
String $pt_logging_max_file_size = '200MB',
|
||||
String $pt_logging_max_history = '90',
|
||||
@@ -1611,8 +1736,19 @@ class puppet_cd::params (
|
||||
String $pt_repl_port = '8082',
|
||||
String $pt_repl_host = '127.0.0.1',
|
||||
|
||||
# r10k
|
||||
Boolean $pt_use_r10k = false,
|
||||
Boolean $pt_use_r10k_webhook = false,
|
||||
String $pt_r10k_remote = 'git@gitlab.example.net/repo.git',
|
||||
Boolean $pt_r10k_prefix = false,
|
||||
String $pt_r10k_basedir = '/etc/puppetlabs/code/environments',
|
||||
|
||||
) {
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
# facts
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
$domain = $facts['networking']['domain']
|
||||
$os_name = $facts['os']['name']
|
||||
$os_release = $facts['os']['release']['major']
|
||||
|
||||
# directories
|
||||
## puppet
|
||||
@@ -1632,6 +1768,8 @@ 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"
|
||||
|
||||
# files
|
||||
## puppet
|
||||
@@ -1641,22 +1779,25 @@ class puppet_cd::params (
|
||||
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
||||
## puppetdb
|
||||
$pt_bootstrap_conf = "${pt_puppetdb_main}/bootstrap.cfg"
|
||||
$pt_bootstrap_erb = 'cd_puppet/puppetdb/bootstrap.cfg.erb'
|
||||
$pt_bootstrap_erb = 'puppet_cd/puppetdb/bootstrap.cfg.erb'
|
||||
$pt_puppetdb_access_log = "${pt_puppetdb_log}/puppetdb-access"
|
||||
$pt_request_logging_conf = "${pt_puppetdb_main}/request-logging.xml"
|
||||
$pt_request_logging_erb = 'cd_puppet/puppetdb/request_logging.xml.erb'
|
||||
$pt_request_logging_erb = 'puppet_cd/puppetdb/request_logging.xml.erb'
|
||||
$pt_logback_conf = "${pt_puppetdb_main}/logback.xml"
|
||||
$pt_logback_erb = 'cd_puppet/puppetdb/logback.xml.erb'
|
||||
$pt_logback_erb = 'puppet_cd/puppetdb/logback.xml.erb'
|
||||
$pt_puppetdb_config_ini = "${pt_puppetdb_conf_d}/config.ini"
|
||||
$pt_puppetdb_config_erb = 'cd_puppet/puppetdb/config.ini.erb'
|
||||
$pt_puppetdb_config_erb = 'puppet_cd/puppetdb/config.ini.erb'
|
||||
$pt_puppetdb_database_ini = "${pt_puppetdb_conf_d}/database.ini"
|
||||
$pt_puppetdb_database_erb = 'cd_puppet/puppetdb/database.ini.erb'
|
||||
$pt_puppetdb_database_erb = 'puppet_cd/puppetdb/database.ini.erb'
|
||||
$pt_puppetdb_jetty_ini = "${pt_puppetdb_conf_d}/jetty.ini"
|
||||
$pt_puppetdb_jetty_erb = 'cd_puppet/puppetdb/jetty.ini.erb'
|
||||
$pt_puppetdb_jetty_erb = 'puppet_cd/puppetdb/jetty.ini.erb'
|
||||
$pt_puppetdb_conf_file = "${pt_puppetdir}/puppetdb.conf"
|
||||
$pt_puppetdb_conf_erb = 'cd_puppet/puppetdb/puppetdb.conf.erb'
|
||||
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
||||
$pt_puppetdb_repl_ini = "${pt_puppetdb_conf_d}/repl.ini"
|
||||
$pt_puppetdb_repl_erb = 'cd_puppet/puppetdb/repl.ini.erb'
|
||||
$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'
|
||||
|
||||
# service
|
||||
$pt_server_service = 'puppetserver'
|
||||
|
||||
Reference in New Issue
Block a user