3
0

Merge branch 'jenkins-build-21' into 'master'

Auto-merge for build 21

See merge request puppet/prometheus_cd!20
This commit is contained in:
2025-10-18 12:11:39 +00:00
5 changed files with 21 additions and 7 deletions

View File

@@ -83,6 +83,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>

View File

@@ -57,35 +57,42 @@
</li>
<li id="object_puppet_classes::prometheus_cd::main::files" class="even">
<li id="object_puppet_classes::prometheus_cd::main::dirs" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::files" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::install" class="odd">
<li id="object_puppet_classes::prometheus_cd::main::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::prometheus_cd::main::install (puppet_class)">prometheus_cd::main::install</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::service" class="even">
<li id="object_puppet_classes::prometheus_cd::main::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html" title="puppet_classes::prometheus_cd::main::service (puppet_class)">prometheus_cd::main::service</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="odd">
<li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ayumrepo.html" title="puppet_classes::prometheus_cd::main::yumrepo (puppet_class)">prometheus_cd::main::yumrepo</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::params" class="even">
<li id="object_puppet_classes::prometheus_cd::params" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Aparams.html" title="puppet_classes::prometheus_cd::params (puppet_class)">prometheus_cd::params</a></span>
</div>

View File

@@ -124,7 +124,7 @@
class prometheus_cd::main::dirs (
) inherits prometheus_cd::params {
require prometheus_cd::main::install
if $ps_prom_host == fqdn {
if ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
file { $ps_main_dir:
ensure =&gt; directory,
owner =&gt; &#39;root&#39;,

View File

@@ -67,6 +67,8 @@
<dt>Inherited by:</dt>
<dd>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span><br/>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span><br/>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::prometheus_cd::main::config (puppet_class)">prometheus_cd::main::config</a></span><br/>

View File

@@ -6,7 +6,7 @@
class prometheus_cd::main::dirs (
) inherits prometheus_cd::params {
require prometheus_cd::main::install
($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
if ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
file { $ps_main_dir:
ensure => directory,
owner => 'root',