3
0

Recommit for updates in build 98

This commit is contained in:
2025-10-30 15:22:03 +01:00
parent 146d07b247
commit db13eb3b72
5 changed files with 64 additions and 14 deletions

View File

@@ -84,6 +84,8 @@
</li><li> </li><li>
<p>manage directories</p> <p>manage directories</p>
</li><li> </li><li>
<p>install node.rb from the foreman for puppetdb</p>
</li><li>
<p>manage puppet user settings (optional)</p> <p>manage puppet user settings (optional)</p>
</li></ul> </li></ul>

View File

@@ -84,6 +84,8 @@
</li><li> </li><li>
<p>manage directories</p> <p>manage directories</p>
</li><li> </li><li>
<p>install node.rb from the foreman for puppetdb</p>
</li><li>
<p>manage puppet user settings (optional)</p> <p>manage puppet user settings (optional)</p>
</li></ul> </li></ul>

View File

@@ -161,7 +161,33 @@
63 63
64 64
65 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>
<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>
@@ -181,6 +207,23 @@ class puppet_cd::main::files (
content =&gt; template($pt_puppet_conf_erb), content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service], notify =&gt; Service[$pt_agent_service],
} }
if $pt_use_puppetdb == true {
file { $pt_node_rb_file:
ensure =&gt; file,
owner =&gt; &#39;puppet&#39;,
group =&gt; &#39;puppet&#39;,
mode =&gt; &#39;0550&#39;,
selrole =&gt; object_r,
seltype =&gt; foreman_enc_t,
seluser =&gt; system_u,
content =&gt; template($pt_node_rb_erb),
}
}
if $pt_use_puppetdb != true {
file { $pt_node_rb_file:
ensure =&gt; absent,
}
}
} }
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {
@@ -215,8 +258,17 @@ class puppet_cd::main::files (
content =&gt; template($pt_routes_erb), content =&gt; template($pt_routes_erb),
notify =&gt; Service[$pt_server_service], notify =&gt; Service[$pt_server_service],
} }
file { $pt_node_rb_file:
ensure =&gt; file,
owner =&gt; &#39;puppet&#39;,
group =&gt; &#39;puppet&#39;,
mode =&gt; &#39;0550&#39;,
selrole =&gt; object_r,
seltype =&gt; foreman_enc_t,
seluser =&gt; system_u,
content =&gt; template($pt_node_rb_erb),
}
} }
if $pt_use_puppetdb != true { if $pt_use_puppetdb != true {
file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
ensure =&gt; absent, ensure =&gt; absent,

View File

@@ -120,12 +120,7 @@
22 22
23 23
24 24
25 25</pre>
26
27
28
29
30</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span> <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: package { $pt_agent_pkg:
ensure =&gt; $pt_pkg_ensure, ensure =&gt; $pt_pkg_ensure,
} }
if $pt_use_puppetdb == true {
package { $pt_puppetdb_pkg:
ensure =&gt; $pt_pkg_ensure,
}
}
} }
if $fqdn == $pt_pm_fqdn { if $fqdn == $pt_pm_fqdn {

View File

@@ -1150,7 +1150,9 @@
170 170
171 171
172 172
173</pre> 173
174
175</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span> <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 = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39; $pt_puppetdb_conf_erb = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
$pt_routes_file = &quot;${pt_puppetdir}/routes.yaml&quot; $pt_routes_file = &quot;${pt_puppetdir}/routes.yaml&quot;
$pt_routes_erb = &#39;puppet_cd/puppetdb/routes.yaml.erb&#39; $pt_routes_erb = &#39;puppet_cd/puppetdb/routes.yaml.erb&#39;
$pt_node_rb_file = &quot;${pt_puppetdir}/node.rb&quot;
$pt_node_rb_erb = &#39;puppet_cd/puppetdb/node.rb.erb&#39;
## r10k ## r10k
$pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot; $pt_r10k_file = &quot;${pt_r10k_dir}/r10k.yaml&quot;