Recommit for updates in build 104
This commit is contained in:
@@ -77,6 +77,10 @@
|
||||
|
||||
<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_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/>
|
||||
|
||||
<span class='object_link'><a href="puppet_cd_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::puppet_cd::server::service (puppet_class)">puppet_cd::server::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/>
|
||||
@@ -1231,7 +1235,27 @@
|
||||
181
|
||||
182
|
||||
183
|
||||
184</pre>
|
||||
184
|
||||
185
|
||||
186
|
||||
187
|
||||
188
|
||||
189
|
||||
190
|
||||
191
|
||||
192
|
||||
193
|
||||
194
|
||||
195
|
||||
196
|
||||
197
|
||||
198
|
||||
199
|
||||
200
|
||||
201
|
||||
202
|
||||
203
|
||||
204</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 64</span>
|
||||
@@ -1307,10 +1331,10 @@ class puppet_cd::params (
|
||||
|
||||
) {
|
||||
# facts
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
$domain = $facts['networking']['domain']
|
||||
$os_name = $facts['os']['name']
|
||||
$os_release = $facts['os']['release']['major']
|
||||
$fqdn = $facts['networking']['fqdn']
|
||||
$domain = $facts['networking']['domain']
|
||||
$os_name = $facts['os']['name']
|
||||
$os_release = $facts['os']['release']['major']
|
||||
|
||||
# directories
|
||||
## puppet
|
||||
@@ -1324,10 +1348,12 @@ class puppet_cd::params (
|
||||
$pt_rundir_master = '/var/run/puppetlabs/puppetserver'
|
||||
$pt_vardir = '/opt/puppetlabs/puppet/cache'
|
||||
$pt_vardir_master = '/opt/puppetlabs/server/data/puppetserver'
|
||||
|
||||
## r10k
|
||||
$pt_r10k_dir = "${pt_main_dir}/r10k"
|
||||
$pt_r10k_webhook_dir = '/etc/r10k-webhook'
|
||||
## puppetdb
|
||||
$pt_puppetdb_dir = '/etc/puppetlabs/puppetdb'
|
||||
$pt_puppetdb_conf_dir = "${pt_puppetdb_dir}/conf.d"
|
||||
|
||||
# files
|
||||
## puppet
|
||||
@@ -1340,13 +1366,31 @@ class puppet_cd::params (
|
||||
$pt_routes_erb = 'puppet_cd/puppetdb/routes.yaml.erb'
|
||||
$pt_node_rb_file = "${pt_puppetdir}/node.rb"
|
||||
$pt_node_rb_erb = 'puppet_cd/puppetdb/node.rb.erb'
|
||||
|
||||
## 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'
|
||||
## puppetdb
|
||||
$pt_bootstrap_conf_file = "${pt_puppetdb_dir}/bootstrap.cfg"
|
||||
$pt_bootstrap_conf_erb = 'puppet_cd/puppetdb/bootstrap.cfg.erb'
|
||||
$pt_logback_conf_file = "${pt_puppetdb_dir}/logback.xml"
|
||||
$pt_logback_conf_erb = 'puppet_cd/puppetdb/logback.xml.erb'
|
||||
$pt_logging_conf_file = "${pt_puppetdb_dir}/request-logging.xml"
|
||||
$pt_logging_conf_erb = 'puppet_cd/puppetdb/request_logging.xml.erb'
|
||||
$pt_auth_conf_file = "${pt_puppetdb_conf_dir}/auth.conf"
|
||||
$pt_auth_conf_erb = 'puppet_cd/puppetdb/auth.conf.erb'
|
||||
$pt_config_ini_file = "${pt_puppetdb_conf_dir}/config.ini"
|
||||
$pt_config_ini_erb = 'puppet_cd/puppetdb/config.ini.erb'
|
||||
$pt_db_ini_file = "${pt_puppetdb_conf_dir}/database.ini"
|
||||
$pt_db_ini_erb = 'puppet_cd/puppetdb/database.ini.erb'
|
||||
$pt_jetty_ini_file = "${pt_puppetdb_conf_dir}/jetty.ini"
|
||||
$pt_jetty_ini_erb = 'puppet_cd/puppetdb/jetty.ini.erb'
|
||||
$pt_repl_ini_file = "${pt_puppetdb_conf_dir}/repl.ini"
|
||||
$pt_repl_ini_erb = 'puppet_cd/puppetdb/repl.ini.erb'
|
||||
$pt_service_conf_file = '/usr/lib/systemd/system/puppetdb.service'
|
||||
$pt_service_conf_erb = 'puppet_cd/puppetdb/service.conf.erb'
|
||||
|
||||
# service
|
||||
$pt_server_service = 'puppetserver'
|
||||
|
||||
Reference in New Issue
Block a user