Recommit for updates in build 91
This commit is contained in:
@@ -141,7 +141,18 @@
|
|||||||
43
|
43
|
||||||
44
|
44
|
||||||
45
|
45
|
||||||
46</pre>
|
46
|
||||||
|
47
|
||||||
|
48
|
||||||
|
49
|
||||||
|
50
|
||||||
|
51
|
||||||
|
52
|
||||||
|
53
|
||||||
|
54
|
||||||
|
55
|
||||||
|
56
|
||||||
|
57</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||||
@@ -175,6 +186,7 @@ class puppet_cd::main::files (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $pt_use_puppetdb == true {
|
if $pt_use_puppetdb == true {
|
||||||
|
# puppetdb.conf
|
||||||
file { $pt_puppetdb_conf_file:
|
file { $pt_puppetdb_conf_file:
|
||||||
ensure => file,
|
ensure => file,
|
||||||
path => $pt_puppetdb_conf_file,
|
path => $pt_puppetdb_conf_file,
|
||||||
@@ -184,6 +196,16 @@ class puppet_cd::main::files (
|
|||||||
content => template($pt_puppetdb_conf_erb),
|
content => template($pt_puppetdb_conf_erb),
|
||||||
notify => Service[$pt_agent_service,$pt_server_service],
|
notify => Service[$pt_agent_service,$pt_server_service],
|
||||||
}
|
}
|
||||||
|
# routes.yaml
|
||||||
|
file { $pt_routes_file:
|
||||||
|
ensure => file,
|
||||||
|
path => $pt_routes_file,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0644',
|
||||||
|
content => template($pt_routes_erb),
|
||||||
|
notify => Service[$pt_server_service],
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
|
|||||||
@@ -1129,7 +1129,9 @@
|
|||||||
166
|
166
|
||||||
167
|
167
|
||||||
168
|
168
|
||||||
169</pre>
|
169
|
||||||
|
170
|
||||||
|
171</pre>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
|
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
|
||||||
@@ -1229,6 +1231,8 @@ class puppet_cd::params (
|
|||||||
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
|
||||||
$pt_puppetdb_conf_file = "${pt_puppetdir}/puppetdb.conf"
|
$pt_puppetdb_conf_file = "${pt_puppetdir}/puppetdb.conf"
|
||||||
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
$pt_puppetdb_conf_erb = 'puppet_cd/puppetdb/puppetdb.conf.erb'
|
||||||
|
$pt_routes_file = "${pt_puppetdir}/routes.yaml"
|
||||||
|
$pt_routes_erb = 'puppet_cd/puppetdb/routes.yaml.erb'
|
||||||
|
|
||||||
## r10k
|
## r10k
|
||||||
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
|
||||||
|
|||||||
Reference in New Issue
Block a user