Recommit for updates in build 78
This commit is contained in:
@@ -129,7 +129,19 @@
|
||||
31
|
||||
32
|
||||
33
|
||||
34</pre>
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -161,6 +173,18 @@ class puppet_cd::main::files (
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
|
||||
if $pt_use_puppetdb == true {
|
||||
file { $pt_puppetdb_conf_file:
|
||||
ensure => file,
|
||||
path => $pt_puppetdb_conf_file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
content => template($pt_puppetdb_conf_erb),
|
||||
notify => Service[$pt_agent_service,$pt_server_service],
|
||||
}
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
<div class="docstring">
|
||||
<div class="discussion">
|
||||
|
||||
<p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid) settings are applied. any other fqdn # will be considered a puppet agent.</p>
|
||||
<p>puppet_cd::params.pp Module name: puppet_cd Author: Arne Teuke (arne_teuke@confdroid)</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -130,6 +130,24 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_use_puppetdb</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Boolean</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>false</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>whether to use puppetdb</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_pm_fqdn</span>
|
||||
@@ -143,7 +161,25 @@
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the fqdn for the puppetmaster and master</p>
|
||||
<p>the fqdn for the puppetmaster and master settings are applied. any other fqdn # will be considered a puppet agent.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_db_fqdn</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'puppetdb.example.net'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the fqdn for the puppetdb node.</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -918,6 +954,24 @@
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the port for the webhook listener</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>pt_ssl_port</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>String</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>'8081'</tt>)</em>
|
||||
|
||||
|
||||
—
|
||||
<div class='inline'>
|
||||
<p>the port for the puppetdb ssl port</p>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
@@ -933,9 +987,6 @@
|
||||
<pre class="lines">
|
||||
|
||||
|
||||
54
|
||||
55
|
||||
56
|
||||
57
|
||||
58
|
||||
59
|
||||
@@ -1037,15 +1088,26 @@
|
||||
155
|
||||
156
|
||||
157
|
||||
158</pre>
|
||||
158
|
||||
159
|
||||
160
|
||||
161
|
||||
162
|
||||
163
|
||||
164
|
||||
165
|
||||
166
|
||||
167</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 54</span>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 57</span>
|
||||
|
||||
class puppet_cd::params (
|
||||
|
||||
Boolean $pt_manage_fw = true,
|
||||
String $pt_pm_fqdn = 'puppetmaster.example.net',
|
||||
String $pt_db_fqdn = 'puppetdb.example.net',
|
||||
Boolean $pt_use_puppetdb = false,
|
||||
|
||||
# installation
|
||||
String $pt_pkg_ensure = 'latest',
|
||||
@@ -1092,6 +1154,9 @@ class puppet_cd::params (
|
||||
String $pt_parser = 'current',
|
||||
Boolean $pt_cert_revocation = true,
|
||||
|
||||
# puppetdb
|
||||
String $pt_ssl_port = '8081',
|
||||
|
||||
# r10k
|
||||
Boolean $pt_use_r10k = false,
|
||||
Boolean $pt_use_r10k_webhook = false,
|
||||
@@ -1128,8 +1193,9 @@ class puppet_cd::params (
|
||||
## puppet
|
||||
$pt_puppet_conf_file = "${pt_puppetdir}/puppet.conf"
|
||||
$pt_puppet_conf_erb = 'puppet_cd/puppet.conf.erb'
|
||||
$pt_agent_conf_erb = 'puppet_cd/agent.conf.erb'
|
||||
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
||||
$pt_puppetdb_conf_file = "${pt_puppetdir}/puppetdb.conf"
|
||||
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
||||
|
||||
## r10k
|
||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||
|
||||
Reference in New Issue
Block a user