Recommit for updates in build 98
This commit is contained in:
@@ -161,7 +161,33 @@
|
||||
63
|
||||
64
|
||||
65
|
||||
66</pre>
|
||||
66
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
71
|
||||
72
|
||||
73
|
||||
74
|
||||
75
|
||||
76
|
||||
77
|
||||
78
|
||||
79
|
||||
80
|
||||
81
|
||||
82
|
||||
83
|
||||
84
|
||||
85
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91
|
||||
92</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -181,6 +207,23 @@ class puppet_cd::main::files (
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service],
|
||||
}
|
||||
if $pt_use_puppetdb == true {
|
||||
file { $pt_node_rb_file:
|
||||
ensure => file,
|
||||
owner => 'puppet',
|
||||
group => 'puppet',
|
||||
mode => '0550',
|
||||
selrole => object_r,
|
||||
seltype => foreman_enc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_node_rb_erb),
|
||||
}
|
||||
}
|
||||
if $pt_use_puppetdb != true {
|
||||
file { $pt_node_rb_file:
|
||||
ensure => absent,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fqdn == $pt_pm_fqdn {
|
||||
@@ -215,8 +258,17 @@ class puppet_cd::main::files (
|
||||
content => template($pt_routes_erb),
|
||||
notify => Service[$pt_server_service],
|
||||
}
|
||||
file { $pt_node_rb_file:
|
||||
ensure => file,
|
||||
owner => 'puppet',
|
||||
group => 'puppet',
|
||||
mode => '0550',
|
||||
selrole => object_r,
|
||||
seltype => foreman_enc_t,
|
||||
seluser => system_u,
|
||||
content => template($pt_node_rb_erb),
|
||||
}
|
||||
}
|
||||
|
||||
if $pt_use_puppetdb != true {
|
||||
file { $pt_puppetdb_conf_file:
|
||||
ensure => absent,
|
||||
|
||||
@@ -120,12 +120,7 @@
|
||||
22
|
||||
23
|
||||
24
|
||||
25
|
||||
26
|
||||
27
|
||||
28
|
||||
29
|
||||
30</pre>
|
||||
25</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
|
||||
@@ -137,11 +132,6 @@ class puppet_cd::main::install (
|
||||
package { $pt_agent_pkg:
|
||||
ensure => $pt_pkg_ensure,
|
||||
}
|
||||
if $pt_use_puppetdb == true {
|
||||
package { $pt_puppetdb_pkg:
|
||||
ensure => $pt_pkg_ensure,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fqdn == $pt_pm_fqdn {
|
||||
|
||||
@@ -1150,7 +1150,9 @@
|
||||
170
|
||||
171
|
||||
172
|
||||
173</pre>
|
||||
173
|
||||
174
|
||||
175</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
|
||||
@@ -1253,6 +1255,8 @@ class puppet_cd::params (
|
||||
$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'
|
||||
$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"
|
||||
|
||||
Reference in New Issue
Block a user